commit 5abbe940ccb27d2beff46e2848b15fc434b45fa0
Author: robin <robin333999@gmail.com>
Date:   Tue Jun 27 10:35:52 2017 +0800

    init

diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..bae442f
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="lib" path="D:/Projects/tsref/android/jsonrpc.jar" sourcepath="D:/Project/tsref/android/jsonrpc.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/.project b/.project
new file mode 100644
index 0000000..f7c75b7
--- /dev/null
+++ b/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MobileSale</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..4824b80
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..54e493c
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..cfcd1d3
--- /dev/null
+++ b/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..5de9290
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,329 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="BWP.MobileSale"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="15" />
+
+    <application
+        android:name="SaleApplication"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.Black"
+        android:debuggable="true" 
+         >
+         
+        <activity
+            android:name=".LoginActivity"
+            android:label="@string/app_name" 
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".ClientUpdateActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="版本更新"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".ServerConfigActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="服务器设置"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".Order.OrderMainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷手机订单"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".Order.OrderEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷订单系统-订单新建"
+            android:screenOrientation="portrait" >
+        </activity>
+         <activity
+            android:name=".Order.OrderSetUserProfileActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷订单系统-订单个性设置"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".Order.OrderDetailEditActivity"
+            android:theme="@android:style/Theme.Dialog"
+            android:windowSoftInputMode="stateVisible" >
+        </activity>
+        <activity
+            android:name=".SelectBuyerActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-选择客户"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+        </activity>
+        <activity
+            android:name=".SelectRemarkActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-选择摘要"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+        </activity>
+        <activity
+            android:name=".Order.OrderListActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷订单系统-订单列表"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".SelectGoodsActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-选择存货"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+        </activity>
+        <activity
+            android:name=".Return.ReturnMainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷退货系统"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".Return.ReturnEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷退货系统-退货登记新建"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".Return.ReturnListActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷退货系统-退货登记列表"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".Return.ReturnSelectGoodsActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷退货系统-选择存货"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".Return.ReturnDetailEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+        </activity>
+        <activity
+            android:name=".Return.SelectSaleOutStoreActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="退货登记-选择出库单"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+        </activity>
+        <activity
+            android:name=".Return.ReturnSetUserProfileActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="退货登记-个性设置"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+        </activity>
+        <activity
+            android:name=".Approval.ApprovalEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷审批系统-签呈"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".Approval.ApprovalListActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷审批系统-签呈列表"
+            android:screenOrientation="portrait" >
+        </activity>
+        
+        <activity
+            android:name=".BranchOrder.BranchOrderMainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷手机系统-门店日报列表"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".BranchOrder.BranchOrderEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷手机系统-门店日报修改"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".BreedLog.BreedLogEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷手机系统-养殖日志修改"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".BreedLog.BreedLogListActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷手机系统-养殖日志列表"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".UserMessageActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-用户消息列表"
+            android:screenOrientation="portrait" >
+        </activity>
+        <service
+            android:name=".UpdateService"
+            android:enabled="true" >
+        </service>
+        <service android:name="CommandService" >
+        </service>
+        <activity android:name="UserMessageDetailActivity"
+              android:label="青花瓷系统-用户消息"
+            android:screenOrientation="portrait" >
+            
+        </activity>
+        <activity
+            android:name=".SelectBatchNoActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-选择批号"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+            
+        </activity>
+        <activity
+            android:name=".SelectStoreActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-选择仓库"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+            
+        </activity>
+        <activity
+            android:name=".SelectAccountingUnitActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-选择会计单位"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+            
+        </activity>
+ 
+         <activity
+            android:name=".MobileAdjustGoodsBill.MobileAdjustGoodsBillMainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷手机调货单"
+            android:screenOrientation="portrait"
+          >
+        </activity>
+
+        <activity
+            android:name=".MobileAdjustGoodsBill.MobileAdjustGoodsBillEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-手机调货单新建"
+            android:screenOrientation="portrait"
+            >
+        </activity>
+        <activity
+            android:name=".MobileAdjustGoodsBill.MobileAdjustGoodsBillListActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-手机调货单列表"
+            android:screenOrientation="portrait"
+		 >
+        </activity>
+        <activity
+            android:name=".MobileAdjustGoodsBill.MobileAdjustGoodsBillSetUserProfileActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-手机调货单个性设置"
+            android:screenOrientation="portrait"
+		 >
+        </activity>
+        <activity
+            android:name=".MobileAdjustGoodsBill.MobileAdjustGoodsBillDetailEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Dialog" >
+        </activity>
+        
+        <activity
+            android:name=".RemainGoods.RemainGoodsMainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷门店留货单"
+            android:screenOrientation="portrait" >
+        </activity>
+
+        <activity
+            android:name=".RemainGoods.RemainGoodsEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-门店留货单新建"
+            android:screenOrientation="portrait"
+            >
+        </activity>
+        <activity
+            android:name=".RemainGoods.RemainGoodsListActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-门店留货单列表"
+            android:screenOrientation="portrait"
+		 >
+        </activity>
+        <activity
+            android:name=".SaleOutStore.SaleOutStoreMainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-销售出库"
+            android:screenOrientation="portrait"
+		 >
+        </activity>        
+        <activity
+            android:name=".SaleOutStore.SaleOutStoreListActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-销售出库列表"
+            android:screenOrientation="portrait"
+		 >
+        </activity>           
+        <activity
+            android:name=".SaleOutStore.SaleOutStoreEditActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-销售出库编辑"
+            android:screenOrientation="portrait" >
+        </activity> 
+        <activity
+            android:name=".ChinaPay.ChinaPayMainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-收付捷"
+            android:screenOrientation="portrait" >
+        </activity>    
+        <activity
+            android:name=".ChinaPay.SetPayProfileActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-付款个性设置"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".ChinaPay.PayActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-订单付款"
+            android:screenOrientation="portrait" >
+        </activity>        
+        <activity
+            android:name=".ChinaPay.PayListActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard"
+            android:label="青花瓷系统-付款记录"
+            android:screenOrientation="portrait" >
+        </activity>     
+        
+    </application>
+
+    
+    
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+</manifest>
\ No newline at end of file
diff --git a/gen/BWP/MobileSale/BuildConfig.java b/gen/BWP/MobileSale/BuildConfig.java
new file mode 100644
index 0000000..e9d5559
--- /dev/null
+++ b/gen/BWP/MobileSale/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package BWP.MobileSale;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/gen/BWP/MobileSale/R.java b/gen/BWP/MobileSale/R.java
new file mode 100644
index 0000000..17149d9
--- /dev/null
+++ b/gen/BWP/MobileSale/R.java
@@ -0,0 +1,404 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package BWP.MobileSale;
+
+public final class R {
+    public static final class anim {
+        public static final int push_left_in=0x7f040000;
+        public static final int push_left_out=0x7f040001;
+        public static final int push_right_in=0x7f040002;
+        public static final int push_right_out=0x7f040003;
+    }
+    public static final class array {
+        public static final int adjustgoodsbill_billstate=0x7f070003;
+        public static final int chinapay_suc=0x7f070006;
+        public static final int orderlist_OrderBy=0x7f070004;
+        public static final int orderlist_billstate=0x7f070002;
+        public static final int orderlist_search=0x7f070001;
+        public static final int planets_array=0x7f070005;
+        public static final int search_starred_options=0x7f070000;
+    }
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int backgroud=0x7f050004;
+        public static final int gold=0x7f050003;
+        public static final int red=0x7f050000;
+        public static final int textColor=0x7f050005;
+        public static final int transparent=0x7f050002;
+        public static final int white=0x7f050001;
+    }
+    public static final class drawable {
+        public static final int approval=0x7f020000;
+        public static final int arrow=0x7f020001;
+        public static final int badge_ifaux=0x7f020002;
+        public static final int bg=0x7f020003;
+        public static final int bg2=0x7f020004;
+        public static final int bg3=0x7f020005;
+        public static final int breedlog=0x7f020006;
+        public static final int changepwd=0x7f020007;
+        public static final int ic_action_search=0x7f020008;
+        public static final int ic_launcher=0x7f020009;
+        public static final int icon=0x7f02000a;
+        public static final int logo1=0x7f02000b;
+        public static final int only_checked_star_checkbox=0x7f02000c;
+        public static final int order=0x7f02000d;
+        public static final int outstore=0x7f02000e;
+        public static final int pay=0x7f02000f;
+        public static final int remaingoods=0x7f020010;
+        public static final int returnrecord=0x7f020011;
+        public static final int rijie=0x7f020012;
+        public static final int star_checkbox=0x7f020013;
+        public static final int star_checkbox_checked=0x7f020014;
+        public static final int star_checkbox_normal=0x7f020015;
+    }
+    public static final class id {
+        public static final int AdjustGoodsBill_Button_Date=0x7f0900a2;
+        public static final int AdjustGoodsBill_Button_SelectGoods=0x7f0900a7;
+        public static final int AdjustGoodsBill_Button_SelectRemark=0x7f0900a4;
+        public static final int AdjustGoodsBill_Check=0x7f09009c;
+        public static final int AdjustGoodsBill_Delete=0x7f09009d;
+        public static final int AdjustGoodsBill_EditText_Remark=0x7f0900a3;
+        public static final int AdjustGoodsBill_Return=0x7f09009a;
+        public static final int AdjustGoodsBill_Save=0x7f09009b;
+        public static final int AdjustGoodsBill_TextView_DetailCount=0x7f0900a5;
+        public static final int AdjustGoodsBill_TextView_DetailNum=0x7f0900a6;
+        public static final int AdjustInBuyerName=0x7f0900a0;
+        public static final int AdjustOutBuyerName=0x7f09009e;
+        public static final int ApprovalButton_Agree=0x7f09000b;
+        public static final int ApprovalButton_Reject=0x7f09000c;
+        public static final int ApprovalEditText_Opinion=0x7f09000d;
+        public static final int ApprovalListView=0x7f090015;
+        public static final int ApprovalTextView_ApprovalRecord=0x7f090011;
+        public static final int Approval_Button_Return=0x7f090014;
+        public static final int Approval_Button_WaitingApproval=0x7f090013;
+        public static final int ApprovalextView_ApprovalContents=0x7f090010;
+        public static final int BatchNo=0x7f090090;
+        public static final int BatchNo_ID=0x7f090091;
+        public static final int Button_Cancel=0x7f090004;
+        public static final int Button_Date=0x7f090047;
+        public static final int Button_EndDate=0x7f090067;
+        public static final int Button_Main_MobileAdjustGoodsBillEdit=0x7f0900aa;
+        public static final int Button_Main_MobileAdjustGoodsBillList=0x7f0900ab;
+        public static final int Button_Main_MobileAdjustGoodsBillSetUserProfile=0x7f0900ac;
+        public static final int Button_Main_OrderEdit=0x7f0900d3;
+        public static final int Button_Main_OrderList=0x7f0900d4;
+        public static final int Button_Main_OrderProfileSet=0x7f0900d5;
+        public static final int Button_Main_RemainGoodsEdit=0x7f0900dd;
+        public static final int Button_Main_RemainGoodsList=0x7f0900de;
+        public static final int Button_Main_ReturnEdit=0x7f0900ee;
+        public static final int Button_Main_ReturnList=0x7f0900ef;
+        public static final int Button_Main_ReturnSetUserProfile=0x7f0900f0;
+        public static final int Button_Main_saleoutstoreList=0x7f090106;
+        public static final int Button_NextPage=0x7f09006a;
+        public static final int Button_OK=0x7f090003;
+        public static final int Button_Pay=0x7f090063;
+        public static final int Button_PayList=0x7f090064;
+        public static final int Button_PayProfileSet=0x7f090065;
+        public static final int Button_Refresh=0x7f0900a9;
+        public static final int Button_Return=0x7f090066;
+        public static final int Button_Save=0x7f090107;
+        public static final int Button_Search=0x7f0900f2;
+        public static final int Button_SetUrl=0x7f090005;
+        public static final int Button_UpPage=0x7f090069;
+        public static final int Button_branchordermain_Return=0x7f090044;
+        public static final int BuyerName=0x7f0900db;
+        public static final int CheckBox=0x7f090092;
+        public static final int CheckBox_AutoSave=0x7f090002;
+        public static final int CheckBox_Star=0x7f090061;
+        public static final int ChinaPay_DoPay=0x7f09007b;
+        public static final int EditText_Number=0x7f090099;
+        public static final int EditText_Password=0x7f090001;
+        public static final int EditText_Price=0x7f0900b2;
+        public static final int EditText_Remark=0x7f09008d;
+        public static final int EditText_Search=0x7f0900f1;
+        public static final int EditText_SecondNumber=0x7f0900b0;
+        public static final int EditText_Url=0x7f09000a;
+        public static final int EditText_Username=0x7f090000;
+        public static final int Goods_Name=0x7f0900cc;
+        public static final int LinearLayout=0x7f09000f;
+        public static final int ListView=0x7f09006b;
+        public static final int Money=0x7f090105;
+        public static final int Number=0x7f0900cd;
+        public static final int Order_Button_Check=0x7f0900b9;
+        public static final int Order_Button_Date=0x7f0900c6;
+        public static final int Order_Button_Delete=0x7f0900bb;
+        public static final int Order_Button_Return=0x7f0900b7;
+        public static final int Order_Button_Save=0x7f0900b8;
+        public static final int Order_Button_SelectAccountingUnit=0x7f0900be;
+        public static final int Order_Button_SelectBuyer=0x7f0900c3;
+        public static final int Order_Button_SelectGoods=0x7f0900cb;
+        public static final int Order_Button_SelectRemark=0x7f0900c9;
+        public static final int Order_Button_SelectStore=0x7f0900c1;
+        public static final int Order_Button_UnCheck=0x7f0900ba;
+        public static final int Order_EditText_Remark=0x7f0900c7;
+        public static final int Order_ListView=0x7f0900a8;
+        public static final int Order_SetUser_Ruturn=0x7f09007a;
+        public static final int Order_SetUser_Save=0x7f09007c;
+        public static final int Order_TextView_AccountingUnit=0x7f0900bd;
+        public static final int Order_TextView_Balance=0x7f0900c5;
+        public static final int Order_TextView_BuyerCode=0x7f090103;
+        public static final int Order_TextView_BuyerName=0x7f0900c2;
+        public static final int Order_TextView_DetailCount=0x7f0900ca;
+        public static final int Order_TextView_Remark=0x7f0900c8;
+        public static final int Order_TextView_Store=0x7f0900c0;
+        public static final int Order_TextView_WrappageAllNum=0x7f090104;
+        public static final int Price=0x7f0900cf;
+        public static final int ProgressBar=0x7f090081;
+        public static final int Return_Button_Check=0x7f0900e0;
+        public static final int Return_Button_Date=0x7f0900e6;
+        public static final int Return_Button_Delete=0x7f0900e1;
+        public static final int Return_Button_SaleOutStore=0x7f0900e5;
+        public static final int Return_Button_Save=0x7f0900df;
+        public static final int Return_Button_SelectBuyer=0x7f0900e3;
+        public static final int Return_Button_SelectGoods=0x7f0900ec;
+        public static final int Return_Button_SelectRemark=0x7f0900e9;
+        public static final int Return_EditText_Remark=0x7f0900e7;
+        public static final int Return_ListView=0x7f0900ed;
+        public static final int Return_SetUser_Ruturn=0x7f0900fc;
+        public static final int Return_SetUser_Save=0x7f0900fd;
+        public static final int Return_TextView_BuyerName=0x7f0900e2;
+        public static final int Return_TextView_DetailCount=0x7f0900ea;
+        public static final int Return_TextView_DetailNum=0x7f0900eb;
+        public static final int Return_TextView_Remark=0x7f0900e8;
+        public static final int Return_TextView_SaleOutStore=0x7f0900e4;
+        public static final int SaleOutStore_Button_Cancel=0x7f0900f7;
+        public static final int SaleOutStore_Button_OK=0x7f0900f6;
+        public static final int SaleOutStore_Button_Search=0x7f0900f4;
+        public static final int SaleOutStore_EditText_Search=0x7f0900f3;
+        public static final int SaleOutStore_ListView=0x7f0900f5;
+        public static final int SecondNumber=0x7f0900ce;
+        public static final int SelectAdjustInBuyer=0x7f0900a1;
+        public static final int SelectAdjustOutBuyer=0x7f09009f;
+        public static final int SelectBatchNo=0x7f09008f;
+        public static final int SelectBuyer=0x7f0900dc;
+        public static final int Spinner_BillStateFilter=0x7f090045;
+        public static final int Spinner_Filter=0x7f090046;
+        public static final int Spinner_OrderBy=0x7f0900d0;
+        public static final int Spinner_suc=0x7f090068;
+        public static final int TextView1=0x7f09006c;
+        public static final int TextView2=0x7f09006f;
+        public static final int TextView3=0x7f09006e;
+        public static final int TextView6=0x7f09006d;
+        public static final int TextViewID=0x7f09010d;
+        public static final int TextView_4=0x7f090070;
+        public static final int TextView_5=0x7f090071;
+        public static final int TextView_BillDate=0x7f090041;
+        public static final int TextView_BillState=0x7f0900d2;
+        public static final int TextView_Buyer=0x7f090042;
+        public static final int TextView_Category=0x7f09010b;
+        public static final int TextView_Code=0x7f090062;
+        public static final int TextView_Content=0x7f09010c;
+        public static final int TextView_Date=0x7f0900d1;
+        public static final int TextView_DiffReadyMoney=0x7f090040;
+        public static final int TextView_Goods_Name=0x7f090098;
+        public static final int TextView_ID=0x7f09003f;
+        public static final int TextView_Name=0x7f090018;
+        public static final int TextView_PolicyPrice=0x7f0900b6;
+        public static final int TextView_Progress=0x7f090080;
+        public static final int TextView_SecondNum=0x7f090084;
+        public static final int TextView_SecondNumber=0x7f0900af;
+        public static final int TextView_Sender=0x7f090109;
+        public static final int TextView_SenderTime=0x7f09010a;
+        public static final int TextView_SentTime=0x7f09010e;
+        public static final int TextView_TodayLoadMoney=0x7f090043;
+        public static final int ViewFlipper1=0x7f090012;
+        public static final int accountingUnitUI=0x7f0900bc;
+        public static final int approvalStaffView=0x7f090016;
+        public static final int approvalTitleView=0x7f090017;
+        public static final int balanceLayout=0x7f0900c4;
+        public static final int batchNoLayout=0x7f0900b4;
+        public static final int branchorder_billdate=0x7f09001d;
+        public static final int branchorder_btnreturn=0x7f090019;
+        public static final int branchorder_btnsave=0x7f09001a;
+        public static final int branchorder_buyername=0x7f09001b;
+        public static final int branchorder_deptname=0x7f09001c;
+        public static final int branchorder_edit_BaiduWaimai=0x7f090032;
+        public static final int branchorder_edit_Changduan=0x7f090030;
+        public static final int branchorder_edit_Eleme=0x7f090033;
+        public static final int branchorder_edit_EmptyBoxNumber=0x7f09003c;
+        public static final int branchorder_edit_LoadBoxNumber=0x7f09003a;
+        public static final int branchorder_edit_MeituanWaimai=0x7f090031;
+        public static final int branchorder_edit_Nuomi=0x7f09002e;
+        public static final int branchorder_edit_RemainMoney=0x7f09003d;
+        public static final int branchorder_edit_Shoukuanka=0x7f09002f;
+        public static final int branchorder_edit_benrijine=0x7f090034;
+        public static final int branchorder_edit_changkuan=0x7f090037;
+        public static final int branchorder_edit_chuzhika=0x7f090036;
+        public static final int branchorder_edit_dzdp=0x7f09002d;
+        public static final int branchorder_edit_fanli=0x7f090028;
+        public static final int branchorder_edit_huiyuanka=0x7f090038;
+        public static final int branchorder_edit_jiesuandan=0x7f090029;
+        public static final int branchorder_edit_tiaohuo=0x7f090025;
+        public static final int branchorder_edit_tihuojuan=0x7f090027;
+        public static final int branchorder_edit_wx=0x7f09002b;
+        public static final int branchorder_edit_xianjin=0x7f09002a;
+        public static final int branchorder_edit_yinhangshuaka=0x7f090026;
+        public static final int branchorder_edit_youhuijuan=0x7f090039;
+        public static final int branchorder_edit_zfb=0x7f09002c;
+        public static final int branchorder_edit_zhaiyao=0x7f09003e;
+        public static final int branchorder_edit_zhidanren=0x7f090035;
+        public static final int branchorder_leftmoney=0x7f09001f;
+        public static final int branchorder_shijifahuo=0x7f090022;
+        public static final int branchorder_sunhao=0x7f090021;
+        public static final int branchorder_sunhaolv=0x7f090020;
+        public static final int branchorder_todaymoney=0x7f09001e;
+        public static final int branchorder_todaysale=0x7f090023;
+        public static final int branchorder_yestodayleftmoney=0x7f090024;
+        public static final int breedlog_edit_account=0x7f09004b;
+        public static final int breedlog_edit_batch=0x7f09004d;
+        public static final int breedlog_edit_btnnew=0x7f090049;
+        public static final int breedlog_edit_btnsave=0x7f09004a;
+        public static final int breedlog_edit_cage=0x7f09004e;
+        public static final int breedlog_edit_date=0x7f09004f;
+        public static final int breedlog_edit_deadgong=0x7f090050;
+        public static final int breedlog_edit_deadmu=0x7f090051;
+        public static final int breedlog_edit_drinkwater=0x7f090055;
+        public static final int breedlog_edit_eattime=0x7f090054;
+        public static final int breedlog_edit_factory=0x7f09004c;
+        public static final int breedlog_edit_taotaigong=0x7f090052;
+        public static final int breedlog_edit_taotaimu=0x7f090053;
+        public static final int breedlog_list_btn_new=0x7f090056;
+        public static final int breedlog_list_btn_return=0x7f090059;
+        public static final int breedlog_list_item_textviewaccount=0x7f09005c;
+        public static final int breedlog_list_item_textviewbatch=0x7f09005f;
+        public static final int breedlog_list_item_textviewcage=0x7f090060;
+        public static final int breedlog_list_item_textviewdate=0x7f09005d;
+        public static final int breedlog_list_item_textviewfactory=0x7f09005e;
+        public static final int breedlog_list_item_textviewid=0x7f09005b;
+        public static final int breedlog_list_listview=0x7f09005a;
+        public static final int breedlog_list_spinnerbillstate=0x7f090057;
+        public static final int breedlog_list_spinnersearch=0x7f090058;
+        public static final int chinapay_accmoney=0x7f090079;
+        public static final int chinapay_fee=0x7f090078;
+        public static final int chinapay_money=0x7f090077;
+        public static final int downrefreshlist=0x7f090048;
+        public static final int goodsNum=0x7f090087;
+        public static final int goodsPolicyPrice=0x7f09008b;
+        public static final int goodsPrice=0x7f090089;
+        public static final int goodsSecondNum=0x7f090085;
+        public static final int head_arrowImageView=0x7f090094;
+        public static final int head_contentLayout=0x7f090093;
+        public static final int head_lastUpdatedTextView=0x7f090097;
+        public static final int head_progressBar=0x7f090095;
+        public static final int head_tipsTextView=0x7f090096;
+        public static final int main_button_changepassword=0x7f090009;
+        public static final int main_button_order=0x7f090006;
+        public static final int main_button_quote=0x7f090008;
+        public static final int main_button_return=0x7f090007;
+        public static final int mobileadjustgoodsbill_SetUser_Ruturn=0x7f0900ad;
+        public static final int mobileadjustgoodsbill_SetUser_Save=0x7f0900ae;
+        public static final int order_setuser_setBankID=0x7f09007d;
+        public static final int order_setuser_setCarNo=0x7f090074;
+        public static final int order_setuser_setCardType=0x7f09007e;
+        public static final int order_setuser_setCerID=0x7f090076;
+        public static final int order_setuser_setCerType=0x7f09007f;
+        public static final int order_setuser_setOrderCarriageManner=0x7f0900d9;
+        public static final int order_setuser_setOrderFarePayer=0x7f0900da;
+        public static final int order_setuser_setPayUserName=0x7f090075;
+        public static final int order_setuser_setSaleType=0x7f0900d8;
+        public static final int order_setuser_setSystemSign=0x7f0900d6;
+        public static final int order_setuser_setTakeGoods_Type=0x7f0900d7;
+        public static final int order_setuser_setaccountunit=0x7f090072;
+        public static final int order_setuser_sethheadoffice=0x7f090073;
+        public static final int policyPriceLayout=0x7f0900b5;
+        public static final int priceLayout=0x7f0900b1;
+        public static final int ranchorder_edit_ReturnBoxNumber=0x7f09003b;
+        public static final int remarkLayout=0x7f0900b3;
+        public static final int return_selectsaleoutstore_listview_check=0x7f0900fb;
+        public static final int return_selectsaleoutstore_listview_goodsname=0x7f0900f9;
+        public static final int return_selectsaleoutstore_listview_id=0x7f0900f8;
+        public static final int return_selectsaleoutstore_listview_price=0x7f0900fa;
+        public static final int return_setuser_setaccountunit=0x7f090101;
+        public static final int return_setuser_setdept=0x7f0900fe;
+        public static final int return_setuser_sethandletype=0x7f090102;
+        public static final int return_setuser_setreturntype=0x7f090100;
+        public static final int return_setuser_setstore=0x7f0900ff;
+        public static final int storeUI=0x7f0900bf;
+        public static final int sv=0x7f09000e;
+        public static final int tableLayout1=0x7f090082;
+        public static final int tableRow1=0x7f090086;
+        public static final int tableRow11=0x7f090083;
+        public static final int tableRow2=0x7f090088;
+        public static final int tableRow3=0x7f09008a;
+        public static final int tableRow4=0x7f09008e;
+        public static final int tableRow5=0x7f09008c;
+        public static final int userMessageListView=0x7f090108;
+    }
+    public static final class layout {
+        public static final int activity_login=0x7f030000;
+        public static final int activity_main=0x7f030001;
+        public static final int activity_serverconfig=0x7f030002;
+        public static final int approval_edit=0x7f030003;
+        public static final int approval_edit_flipper=0x7f030004;
+        public static final int approval_list=0x7f030005;
+        public static final int approval_list_item=0x7f030006;
+        public static final int batchno_select_item=0x7f030007;
+        public static final int branchorder_edit=0x7f030008;
+        public static final int branchorder_listinner=0x7f030009;
+        public static final int branchorder_main=0x7f03000a;
+        public static final int breedlog_edit=0x7f03000b;
+        public static final int breedlog_list=0x7f03000c;
+        public static final int breedlog_list_item=0x7f03000d;
+        public static final int buyer_select_item=0x7f03000e;
+        public static final int chianpay_main=0x7f03000f;
+        public static final int chinapay_list=0x7f030010;
+        public static final int chinapay_list_item=0x7f030011;
+        public static final int chinapay_pay=0x7f030012;
+        public static final int chinapay_setuserprofile=0x7f030013;
+        public static final int client_update=0x7f030014;
+        public static final int edittext=0x7f030015;
+        public static final int goods_multiselect_item=0x7f030016;
+        public static final int head=0x7f030017;
+        public static final int mobileadjustgoodsbill_detail_edit=0x7f030018;
+        public static final int mobileadjustgoodsbill_edit=0x7f030019;
+        public static final int mobileadjustgoodsbill_list=0x7f03001a;
+        public static final int mobileadjustgoodsbill_main=0x7f03001b;
+        public static final int mobileadjustgoodsbill_setuserprofile=0x7f03001c;
+        public static final int order_detail_edit=0x7f03001d;
+        public static final int order_edit=0x7f03001e;
+        public static final int order_edit_detail_list_item=0x7f03001f;
+        public static final int order_list=0x7f030020;
+        public static final int order_list_item=0x7f030021;
+        public static final int order_main=0x7f030022;
+        public static final int order_setuserprofile=0x7f030023;
+        public static final int remaingoods_edit=0x7f030024;
+        public static final int remaingoods_list=0x7f030025;
+        public static final int remaingoods_main=0x7f030026;
+        public static final int return_detail_edit=0x7f030027;
+        public static final int return_edit=0x7f030028;
+        public static final int return_edit_detail_list_item=0x7f030029;
+        public static final int return_list=0x7f03002a;
+        public static final int return_main=0x7f03002b;
+        public static final int return_selectgoods=0x7f03002c;
+        public static final int return_selectsaleoutstore=0x7f03002d;
+        public static final int return_selectsaleoutstore_listview=0x7f03002e;
+        public static final int return_setuserprofile=0x7f03002f;
+        public static final int saleoutstore_edit=0x7f030030;
+        public static final int saleoutstore_edit_detail_list_item=0x7f030031;
+        public static final int saleoutstore_list=0x7f030032;
+        public static final int saleoutstore_list_item=0x7f030033;
+        public static final int saleoutstore_main=0x7f030034;
+        public static final int selectbatchno=0x7f030035;
+        public static final int selectbuyer=0x7f030036;
+        public static final int selectgoods=0x7f030037;
+        public static final int selectremark=0x7f030038;
+        public static final int usermassage=0x7f030039;
+        public static final int usermassage_detail=0x7f03003a;
+        public static final int usermessage_list_item=0x7f03003b;
+    }
+    public static final class string {
+        public static final int app_name=0x7f060000;
+        public static final int createTable_ClientBuyer=0x7f060002;
+        public static final int createTable_ClientGoods=0x7f060001;
+        public static final int sql_createServerHistory=0x7f060003;
+    }
+    public static final class style {
+        public static final int AppTheme=0x7f080000;
+    }
+}
diff --git a/ic_launcher-web.png b/ic_launcher-web.png
new file mode 100644
index 0000000..5338964
Binary files /dev/null and b/ic_launcher-web.png differ
diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
new file mode 100644
index 0000000..feaf44f
Binary files /dev/null and b/libs/android-support-v4.jar differ
diff --git a/lint.xml b/lint.xml
new file mode 100644
index 0000000..1243b11
--- /dev/null
+++ b/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="HardcodedDebugMode">
+        <ignore path="AndroidManifest.xml" />
+    </issue>
+</lint>
\ No newline at end of file
diff --git a/proguard-project.txt b/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/project.properties b/project.properties
new file mode 100644
index 0000000..b7c2081
--- /dev/null
+++ b/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-10
diff --git a/res/anim/push_left_in.xml b/res/anim/push_left_in.xml
new file mode 100644
index 0000000..063d660
--- /dev/null
+++ b/res/anim/push_left_in.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>  
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="100%p" android:toXDelta="0"
+        android:duration="500" />
+    <alpha android:fromAlpha="0.1" android:toAlpha="1.0"
+        android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/res/anim/push_left_out.xml b/res/anim/push_left_out.xml
new file mode 100644
index 0000000..9f1ef1b
--- /dev/null
+++ b/res/anim/push_left_out.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="0" android:toXDelta="-100%p"
+        android:duration="500" />
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.1"
+        android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/res/anim/push_right_in.xml b/res/anim/push_right_in.xml
new file mode 100644
index 0000000..c01ac93
--- /dev/null
+++ b/res/anim/push_right_in.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="-100%p" android:toXDelta="0"
+        android:duration="500" />
+    <alpha android:fromAlpha="0.1" android:toAlpha="1.0"
+        android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/res/anim/push_right_out.xml b/res/anim/push_right_out.xml
new file mode 100644
index 0000000..894cb72
--- /dev/null
+++ b/res/anim/push_right_out.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="0" android:toXDelta="100%p"
+        android:duration="500" />
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.1"
+        android:duration="500" />
+
+</set>
\ No newline at end of file
diff --git a/res/drawable-hdpi/arrow.png b/res/drawable-hdpi/arrow.png
new file mode 100644
index 0000000..6f3933a
Binary files /dev/null and b/res/drawable-hdpi/arrow.png differ
diff --git a/res/drawable-hdpi/badge_ifaux.9.png b/res/drawable-hdpi/badge_ifaux.9.png
new file mode 100644
index 0000000..cfb59bf
Binary files /dev/null and b/res/drawable-hdpi/badge_ifaux.9.png differ
diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
new file mode 100644
index 0000000..67de12d
Binary files /dev/null and b/res/drawable-hdpi/ic_action_search.png differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..13cea6c
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher.png differ
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000..8074c4c
Binary files /dev/null and b/res/drawable-hdpi/icon.png differ
diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..003a4da
Binary files /dev/null and b/res/drawable-ldpi/ic_launcher.png differ
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000..1095584
Binary files /dev/null and b/res/drawable-ldpi/icon.png differ
diff --git a/res/drawable-ldpi/star_checkbox_checked.png b/res/drawable-ldpi/star_checkbox_checked.png
new file mode 100644
index 0000000..23f7106
Binary files /dev/null and b/res/drawable-ldpi/star_checkbox_checked.png differ
diff --git a/res/drawable-ldpi/star_checkbox_normal.png b/res/drawable-ldpi/star_checkbox_normal.png
new file mode 100644
index 0000000..2f904f1
Binary files /dev/null and b/res/drawable-ldpi/star_checkbox_normal.png differ
diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
new file mode 100644
index 0000000..134d549
Binary files /dev/null and b/res/drawable-mdpi/ic_action_search.png differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..49d7f10
Binary files /dev/null and b/res/drawable-mdpi/ic_launcher.png differ
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000..a07c69f
Binary files /dev/null and b/res/drawable-mdpi/icon.png differ
diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
new file mode 100644
index 0000000..d699c6b
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..6096bb5
Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/res/drawable/approval.png b/res/drawable/approval.png
new file mode 100644
index 0000000..449d234
Binary files /dev/null and b/res/drawable/approval.png differ
diff --git a/res/drawable/bg.jpg b/res/drawable/bg.jpg
new file mode 100644
index 0000000..07863eb
Binary files /dev/null and b/res/drawable/bg.jpg differ
diff --git a/res/drawable/bg2.jpg b/res/drawable/bg2.jpg
new file mode 100644
index 0000000..214575c
Binary files /dev/null and b/res/drawable/bg2.jpg differ
diff --git a/res/drawable/bg3.jpg b/res/drawable/bg3.jpg
new file mode 100644
index 0000000..51d2e0c
Binary files /dev/null and b/res/drawable/bg3.jpg differ
diff --git a/res/drawable/breedlog.png b/res/drawable/breedlog.png
new file mode 100644
index 0000000..bda2ec4
Binary files /dev/null and b/res/drawable/breedlog.png differ
diff --git a/res/drawable/changepwd.png b/res/drawable/changepwd.png
new file mode 100644
index 0000000..415985f
Binary files /dev/null and b/res/drawable/changepwd.png differ
diff --git a/res/drawable/icon.png b/res/drawable/icon.png
new file mode 100644
index 0000000..8074c4c
Binary files /dev/null and b/res/drawable/icon.png differ
diff --git a/res/drawable/logo1.png b/res/drawable/logo1.png
new file mode 100644
index 0000000..e11e677
Binary files /dev/null and b/res/drawable/logo1.png differ
diff --git a/res/drawable/only_checked_star_checkbox.xml b/res/drawable/only_checked_star_checkbox.xml
new file mode 100644
index 0000000..a78e003
--- /dev/null
+++ b/res/drawable/only_checked_star_checkbox.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/star_checkbox_checked" android:state_checked="true"/>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/order.png b/res/drawable/order.png
new file mode 100644
index 0000000..b8598c9
Binary files /dev/null and b/res/drawable/order.png differ
diff --git a/res/drawable/outstore.png b/res/drawable/outstore.png
new file mode 100644
index 0000000..9d2ec6b
Binary files /dev/null and b/res/drawable/outstore.png differ
diff --git a/res/drawable/pay.png b/res/drawable/pay.png
new file mode 100644
index 0000000..c865502
Binary files /dev/null and b/res/drawable/pay.png differ
diff --git a/res/drawable/remaingoods.png b/res/drawable/remaingoods.png
new file mode 100644
index 0000000..39a1bfe
Binary files /dev/null and b/res/drawable/remaingoods.png differ
diff --git a/res/drawable/returnrecord.png b/res/drawable/returnrecord.png
new file mode 100644
index 0000000..bdf1829
Binary files /dev/null and b/res/drawable/returnrecord.png differ
diff --git a/res/drawable/rijie.png b/res/drawable/rijie.png
new file mode 100644
index 0000000..db5e451
Binary files /dev/null and b/res/drawable/rijie.png differ
diff --git a/res/drawable/star_checkbox.xml b/res/drawable/star_checkbox.xml
new file mode 100644
index 0000000..560c10f
--- /dev/null
+++ b/res/drawable/star_checkbox.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="true" android:drawable="@drawable/star_checkbox_checked" />
+	<item android:state_checked="false" android:drawable="@drawable/star_checkbox_normal" />
+</selector>
\ No newline at end of file
diff --git a/res/layout/activity_login.xml b/res/layout/activity_login.xml
new file mode 100644
index 0000000..f629974
--- /dev/null
+++ b/res/layout/activity_login.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="用户名"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/EditText_Username"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="用户名"
+        android:inputType="textPersonName" >
+
+        <requestFocus />
+    </EditText>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="密码"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/EditText_Password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="密码"
+        android:inputType="textPassword" />
+
+    <CheckBox
+        android:id="@+id/CheckBox_AutoSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="自动保存密码" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="clip_horizontal" >
+
+        <Button
+            android:id="@+id/Button_OK"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="登录" />
+
+        <Button
+            android:id="@+id/Button_Cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="取消" />
+        
+        <Button 
+            android:id="@+id/Button_SetUrl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="设置"
+            />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
new file mode 100644
index 0000000..c3d69aa
--- /dev/null
+++ b/res/layout/activity_main.xml
@@ -0,0 +1,32 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+ <Button 
+     android:id="@+id/main_button_order"
+     android:layout_width="match_parent"
+     android:layout_height="wrap_content"
+     android:text="手机订单"/>
+ 
+  <Button 
+     android:id="@+id/main_button_return"
+     android:layout_width="match_parent"
+     android:layout_height="wrap_content"
+     android:text="手机退货"/>
+
+    <Button 
+     android:id="@+id/main_button_quote"
+     android:layout_width="match_parent"
+     android:layout_height="wrap_content"
+     android:text="门店日结"/>
+    
+    <Button
+        android:id="@+id/main_button_changepassword"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="修改密码" />
+  
+  
+</LinearLayout>
diff --git a/res/layout/activity_serverconfig.xml b/res/layout/activity_serverconfig.xml
new file mode 100644
index 0000000..1daacf2
--- /dev/null
+++ b/res/layout/activity_serverconfig.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="服务器地址："
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/EditText_Url"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <requestFocus />
+    </EditText>
+    <!-- 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="订单列表每页显示条数："
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/EditText_PageCount"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <requestFocus />
+    </EditText>
+     -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_OK"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="确定" />
+
+        <Button
+            android:id="@+id/Button_Cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="取消" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/approval_edit.xml b/res/layout/approval_edit.xml
new file mode 100644
index 0000000..28c4f85
--- /dev/null
+++ b/res/layout/approval_edit.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <!-- 使EditText不自动得到焦点 -->
+
    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/ApprovalButton_Agree"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="同意" />
+
+        <Button
+            android:id="@+id/ApprovalButton_Reject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="驳回" />
+
+        <EditText
+            android:id="@+id/ApprovalEditText_Opinion"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+        </EditText>
+    </LinearLayout>
+
+    <ScrollView
+        android:id="@+id/sv"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:id="@+id/LinearLayout"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/ApprovalextView_ApprovalContents"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/textColor"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:text=" "
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <TextView
+                android:id="@+id/ApprovalTextView_ApprovalRecord"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/textColor"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/approval_edit_flipper.xml b/res/layout/approval_edit_flipper.xml
new file mode 100644
index 0000000..974c532
--- /dev/null
+++ b/res/layout/approval_edit_flipper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+
+    <ViewFlipper android:id="@+id/ViewFlipper1"
+        android:layout_width="fill_parent" 
+        android:layout_height="fill_parent">
+    </ViewFlipper>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/approval_list.xml b/res/layout/approval_list.xml
new file mode 100644
index 0000000..d57303d
--- /dev/null
+++ b/res/layout/approval_list.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Approval_Button_WaitingApproval"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="待审" />
+
+        <!--
+             <Button
+            android:id="@+id/Approval_Button_More"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="更多" />
+        -->
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/Approval_Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ApprovalListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/approval_list_item.xml b/res/layout/approval_list_item.xml
new file mode 100644
index 0000000..62e51cf
--- /dev/null
+++ b/res/layout/approval_list_item.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/approvalStaffView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Staff" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/approvalTitleView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Title"
+            android:textColor="@color/textColor"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+    
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/batchno_select_item.xml b/res/layout/batchno_select_item.xml
new file mode 100644
index 0000000..1006099
--- /dev/null
+++ b/res/layout/batchno_select_item.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+>
+
+        <TextView
+            android:id="@+id/TextView_Name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Large Text"
+            android:textAppearance="?android:attr/textAppearanceLarge" 
+            />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/branchorder_edit.xml b/res/layout/branchorder_edit.xml
new file mode 100644
index 0000000..4872e60
--- /dev/null
+++ b/res/layout/branchorder_edit.xml
@@ -0,0 +1,774 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:focusable="true"
+      android:focusableInTouchMode="true"
+      android:orientation="vertical" >
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+      <Button
+          android:id="@+id/branchorder_btnreturn"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="返回" />
+
+      <Button
+          android:id="@+id/branchorder_btnsave"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="保存" />
+    </LinearLayout>
+
+    <!-- 购货客户 -->
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="购货客户:" />
+
+      <TextView
+          android:id="@+id/branchorder_buyername"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="部        门:" />
+
+        <TextView
+            android:id="@+id/branchorder_deptname"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="制单日期:" />
+
+        <TextView
+            android:id="@+id/branchorder_billdate"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <!-- 昨日余额 -->
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="本日发货:" />
+
+        <TextView
+            android:id="@+id/branchorder_todaymoney"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="摊点退货:" />
+
+        <TextView
+            android:id="@+id/branchorder_leftmoney"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="损  耗  率:" />
+
+        <TextView
+            android:id="@+id/branchorder_sunhaolv"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="损        耗:" />
+
+        <TextView
+            android:id="@+id/branchorder_sunhao"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <!-- 损耗 -->
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="实际发货:" />
+
+        <TextView
+            android:id="@+id/branchorder_shijifahuo"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="本日销售:" />
+
+        <TextView
+            android:id="@+id/branchorder_todaysale"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="昨日库存:" />
+
+        <TextView
+            android:id="@+id/branchorder_yestodayleftmoney"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="调        货:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_tiaohuo"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="银行刷卡:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_yinhangshuaka"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="提  货  券:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_tihuojuan"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返        利:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_fanli"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="结  算  单:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_jiesuandan"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="现        金:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_xianjin"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="微        信:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_wx"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="支  付  宝:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_zfb"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="美团团购:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_dzdp"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="百度糯米:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_Nuomi"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="收  款  卡:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_Shoukuanka"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="长  短  款:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_Changduan"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="美团外卖:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_MeituanWaimai"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="百度外卖:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_BaiduWaimai"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="饿  了  么:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_Eleme"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="本日库存:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_benrijine"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="制  单  人:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_zhidanren"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="储  值  卡:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_chuzhika"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="长        款:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_changkuan"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="会  员  卡:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_huiyuanka"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="优  惠  券:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_youhuijuan"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="发货箱数:" />
+
+        <TextView
+            android:id="@+id/branchorder_edit_LoadBoxNumber"
+            android:layout_width="90dip"
+            android:layout_height="36dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="退货箱数:" />
+
+        <EditText
+            android:id="@+id/ranchorder_edit_ReturnBoxNumber"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="空  箱  数:" />
+
+        <EditText
+            android:id="@+id/branchorder_edit_EmptyBoxNumber"
+            android:layout_width="90dip"
+            android:layout_height="36dip"
+            android:textSize="12dip" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="留货金额:" />
+
+        <TextView
+            android:id="@+id/branchorder_edit_RemainMoney"
+            android:layout_width="90dip"
+            android:layout_height="36dip" />
+      </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="摘        要:" />
+
+      <EditText
+          android:id="@+id/branchorder_edit_zhaiyao"
+          android:layout_width="250dip"
+          android:layout_height="36dip"
+          android:textSize="12dip" />
+    </LinearLayout>
+  </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/branchorder_listinner.xml b/res/layout/branchorder_listinner.xml
new file mode 100644
index 0000000..27edc73
--- /dev/null
+++ b/res/layout/branchorder_listinner.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="NO."
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+
+        <TextView
+            android:id="@+id/TextView_ID"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="     现金差异:"
+            android:textColor="@color/red"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+
+        <TextView
+            android:id="@+id/TextView_DiffReadyMoney"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+             android:textColor="@color/red"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="     "
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+
+        <TextView
+            android:id="@+id/TextView_BillDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/TextView_Buyer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+        <!--
+         <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=" 摊点剩货:"
+            android:textSize="14dp"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+          <TextView 
+            android:id="@+id/TextView_LeftMoney"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+             android:textSize="14dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            />-->
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="       本日发货:"  
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+
+        <TextView
+            android:id="@+id/TextView_TodayLoadMoney"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"             
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="14dp" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/branchorder_main.xml b/res/layout/branchorder_main.xml
new file mode 100644
index 0000000..029f691
--- /dev/null
+++ b/res/layout/branchorder_main.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" > 
+
<LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_branchordermain_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+                <Spinner
+                    android:id="@+id/Spinner_BillStateFilter"
+                    android:layout_width="90dp"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/orderlist_billstate" />
+        
+        <Spinner
+            android:id="@+id/Spinner_Filter"
+            android:layout_width="90dp"
+            android:layout_height="wrap_content"
+            android:entries="@array/orderlist_search" />
+
+        <Button
+            android:id="@+id/Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="制单日期"
+            android:text="" />
+    </LinearLayout>
+    
+    <!-- 
+    <ListView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+</ListView>
+ -->
+    
+    <BWP.MobileSale.Ui.DownRefreshListView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/downrefreshlist"
+    />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/breedlog_edit.xml b/res/layout/breedlog_edit.xml
new file mode 100644
index 0000000..6a259d8
--- /dev/null
+++ b/res/layout/breedlog_edit.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/breedlog_edit_btnnew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="新建" />
+
+        <Button
+            android:id="@+id/breedlog_edit_btnsave"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="保存" />
+    </LinearLayout>
+
+    <ScrollView 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+       
+        >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="会计单位:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <Spinner
+                android:id="@+id/breedlog_edit_account"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="养  殖  场:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <Spinner
+                android:id="@+id/breedlog_edit_factory"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="批        次:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <Spinner
+                android:id="@+id/breedlog_edit_batch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="禽        舍:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <Spinner
+                android:id="@+id/breedlog_edit_cage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="日        期:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <TextView
+                android:id="@+id/breedlog_edit_date"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="♂ 死   亡:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <EditText
+                android:id="@+id/breedlog_edit_deadgong"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" >
+            </EditText>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="♀ 死   亡:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <EditText
+                android:id="@+id/breedlog_edit_deadmu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" >
+            </EditText>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="♂ 淘   汰:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <EditText
+                android:id="@+id/breedlog_edit_taotaigong"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" >
+            </EditText>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="♀ 淘   汰:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <EditText
+                android:id="@+id/breedlog_edit_taotaimu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" >
+            </EditText>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="吃料时间:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <EditText
+                android:id="@+id/breedlog_edit_eattime"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" >
+            </EditText>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="饮  水  量:"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <EditText
+                android:id="@+id/breedlog_edit_drinkwater"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp" >
+            </EditText>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/breedlog_list.xml b/res/layout/breedlog_list.xml
new file mode 100644
index 0000000..191e89e
--- /dev/null
+++ b/res/layout/breedlog_list.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+            
+        <Button
+            android:id="@+id/breedlog_list_btn_new"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="新建" />
+
+          <Spinner
+                    android:id="@+id/breedlog_list_spinnerbillstate"
+                    android:layout_width="90dp"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/orderlist_billstate" />
+        
+        <Spinner
+            android:id="@+id/breedlog_list_spinnersearch"
+            android:layout_width="90dp"
+            android:layout_height="wrap_content"
+            android:entries="@array/orderlist_search" />
+
+        
+            <Button
+            android:id="@+id/breedlog_list_btn_return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/breedlog_list_listview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/breedlog_list_item.xml b/res/layout/breedlog_list_item.xml
new file mode 100644
index 0000000..3dbcdba
--- /dev/null
+++ b/res/layout/breedlog_list_item.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="NO."
+             />
+
+        <TextView
+            android:id="@+id/breedlog_list_item_textviewid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+             />
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="  会："
+             />
+        <TextView
+            android:id="@+id/breedlog_list_item_textviewaccount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+             />
+
+           <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="  "
+             />
+        <TextView
+            android:id="@+id/breedlog_list_item_textviewdate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+             />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+          <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="  养："
+            />
+        
+        <TextView
+            android:id="@+id/breedlog_list_item_textviewfactory"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+
+          <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="  批："
+             />
+
+        <TextView
+            android:id="@+id/breedlog_list_item_textviewbatch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+        
+           <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="  舍："
+            />
+           
+         <TextView
+            android:id="@+id/breedlog_list_item_textviewcage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/buyer_select_item.xml b/res/layout/buyer_select_item.xml
new file mode 100644
index 0000000..0da5ad6
--- /dev/null
+++ b/res/layout/buyer_select_item.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal" >
+
+    <CheckBox
+        android:id="@+id/CheckBox_Star"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@drawable/only_checked_star_checkbox"
+        android:clickable="false"
+        android:focusable="false" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/TextView_Name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Large Text"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextView_Code"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Small Text"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chianpay_main.xml b/res/layout/chianpay_main.xml
new file mode 100644
index 0000000..97844c7
--- /dev/null
+++ b/res/layout/chianpay_main.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+   <Button
+        android:id="@+id/Button_Pay"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="订单付款" />
+   
+    <Button
+        android:id="@+id/Button_PayList"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="付款记录" />   
+   
+    <Button
+        android:id="@+id/Button_PayProfileSet"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="个性设置" />     
+
+</LinearLayout>
diff --git a/res/layout/chinapay_list.xml b/res/layout/chinapay_list.xml
new file mode 100644
index 0000000..6da8ba5
--- /dev/null
+++ b/res/layout/chinapay_list.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_Return"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="返回" />
+
+        <Button
+            android:id="@+id/Button_Date"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="开始日期"
+            android:text="" />
+
+        <Button
+            android:id="@+id/Button_EndDate"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="结束日期"
+            android:text="" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Spinner
+            android:id="@+id/Spinner_suc"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:entries="@array/chinapay_suc" />
+
+        <Button
+            android:id="@+id/Button_UpPage"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="上一页" />
+
+        <Button
+            android:id="@+id/Button_NextPage"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="下一页" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chinapay_list_item.xml b/res/layout/chinapay_list_item.xml
new file mode 100644
index 0000000..1f6dd45
--- /dev/null
+++ b/res/layout/chinapay_list_item.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="￥" />
+
+        <TextView
+            android:id="@+id/TextView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Money"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextView6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Money2" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/TextView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:text="IsSuc" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/TextView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Date" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/TextView_4"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_weight="1.55"
+            android:text="HO"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.09" />
+
+        <TextView
+            android:id="@+id/TextView_5"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.49"
+            android:text="Msg" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chinapay_pay.xml b/res/layout/chinapay_pay.xml
new file mode 100644
index 0000000..14904f2
--- /dev/null
+++ b/res/layout/chinapay_pay.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="0px"
+            android:layout_height="0px"
+            android:focusable="true"
+            android:focusableInTouchMode="true" />
+
+        <requestFocus
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="会计单位 :" />
+
+        <Spinner
+            android:id="@+id/order_setuser_setaccountunit"
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="往来客户 :" />
+
+        <Spinner
+            android:id="@+id/order_setuser_sethheadoffice"
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="卡号/折号:" />
+
+        <Spinner
+            android:id="@+id/order_setuser_setCarNo"
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="付款人 :" />
+
+            <TextView
+                android:id="@+id/order_setuser_setPayUserName"
+                android:layout_width="match_parent"
+                android:layout_height="50dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="证件号 :" />
+
+            <TextView
+                android:id="@+id/order_setuser_setCerID"
+                android:layout_width="match_parent"
+                android:layout_height="50dp" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="金额:" />
+
+        <EditText
+            android:id="@+id/chinapay_money"
+            android:layout_width="match_parent"
+            android:layout_height="50dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="手续费:" />
+
+            <TextView
+                android:id="@+id/chinapay_fee"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="实际到账金额:" />
+
+            <TextView
+                android:id="@+id/chinapay_accmoney"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="191dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/Order_SetUser_Ruturn"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_weight="0.5"
+                android:text="返回" />
+
+            <Button
+                android:id="@+id/ChinaPay_DoPay"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_gravity="fill"
+                android:layout_weight="0.5"
+                android:text="付款" />
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/chinapay_setuserprofile.xml b/res/layout/chinapay_setuserprofile.xml
new file mode 100644
index 0000000..44e9743
--- /dev/null
+++ b/res/layout/chinapay_setuserprofile.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="0px"
+            android:layout_height="0px"
+            android:focusable="true"
+            android:focusableInTouchMode="true" />
+
+        <requestFocus />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/Order_SetUser_Ruturn"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:text="返回" />
+
+            <Button
+                android:id="@+id/Order_SetUser_Save"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:text="保存" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="会计单位 :" />
+
+        <Spinner
+            android:id="@+id/order_setuser_setaccountunit"
+            android:layout_width="250dp"
+            android:layout_height="50dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="往来客户 :" />
+
+        <Spinner
+            android:id="@+id/order_setuser_sethheadoffice"
+            android:layout_width="250dp"
+            android:layout_height="50dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="卡号/折号:" />
+
+        <Spinner
+            android:id="@+id/order_setuser_setCarNo"
+            android:layout_width="250dp"
+            android:layout_height="50dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="开户行:" />
+
+            <TextView
+                android:id="@+id/order_setuser_setBankID"
+                android:layout_width="250dp"
+                android:layout_height="50dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="卡折标志:" />
+
+            <TextView
+                android:id="@+id/order_setuser_setCardType"
+                android:layout_width="250dp"
+                android:layout_height="50dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="付款人 :" />
+
+            <TextView
+                android:id="@+id/order_setuser_setPayUserName"
+                android:layout_width="250dp"
+                android:layout_height="50dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="证件类型:" />
+
+            <TextView
+                android:id="@+id/order_setuser_setCerType"
+                android:layout_width="250dp"
+                android:layout_height="50dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="证件号 :" />
+
+            <TextView
+                android:id="@+id/order_setuser_setCerID"
+                android:layout_width="250dp"
+                android:layout_height="50dp" />
+        </LinearLayout>
+    </LinearLayout>
+
</ScrollView>
\ No newline at end of file
diff --git a/res/layout/client_update.xml b/res/layout/client_update.xml
new file mode 100644
index 0000000..d093e98
--- /dev/null
+++ b/res/layout/client_update.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/TextView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="版本更新"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/TextView_Progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <ProgressBar
+            android:id="@+id/ProgressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/Button_OK"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="安装" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/edittext.xml b/res/layout/edittext.xml
new file mode 100644
index 0000000..bcc18c7
--- /dev/null
+++ b/res/layout/edittext.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"  
+    android:orientation="vertical"  
+    android:layout_width="fill_parent"  
+    android:layout_height="fill_parent"  
+    >   
+    <TableLayout 
+        android:layout_width="match_parent" 
+        android:layout_height="wrap_content" 
+        android:id="@+id/tableLayout1">   
+        <TableRow 
+            android:id="@+id/tableRow11" 
+            android:layout_width="wrap_content" 
+            android:layout_height="wrap_content" 
+            android:padding="10dip"
+            >   
+            <TextView 
+                android:text="辅数量：" 
+                android:layout_height="wrap_content" 
+                android:layout_width="wrap_content" 
+                android:textSize="20dip"
+                android:id="@+id/TextView_SecondNum"
+                /> 
+            <EditText 
+                android:layout_weight="1" 
+                android:id="@+id/goodsSecondNum" 
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="numberDecimal" 
+                />   
+        </TableRow>  
+        <TableRow 
+            android:id="@+id/tableRow1" 
+            android:layout_width="wrap_content" 
+            android:layout_height="wrap_content" 
+            android:padding="10dip"
+            >   
+            <TextView 
+                android:text="数量：" 
+                android:layout_height="wrap_content" 
+                android:layout_width="wrap_content" 
+                android:textSize="20dip"/> 
+            <EditText 
+                android:layout_weight="1" 
+                android:id="@+id/goodsNum" 
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="numberDecimal" 
+                />   
+        </TableRow>
+           
+    	<TableRow 
+    	    android:layout_width="match_parent" 
+    	    android:layout_height="wrap_content" 
+    	    android:id="@+id/tableRow2" 
+    	    android:clickable="true" 
+    	    android:padding="10dip">   
+        <TextView 
+            android:text="价格："
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" 
+            android:textSize="20dip"
+            />
+        <EditText 
+            android:layout_weight="1" 
+            android:id="@+id/goodsPrice" 
+            android:layout_width="wrap_content" 
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal"
+            />
+    	</TableRow>
+    	<TableRow 
+    	    android:layout_width="match_parent" 
+    	    android:layout_height="wrap_content" 
+    	    android:clickable="true" 
+    	    android:id="@+id/tableRow3" 
+    	    android:padding="10dip">   
+        <TextView 
+            android:text="政策价格："
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" 
+            android:textSize="20dip"
+            />
+        <TextView 
+            android:layout_weight="1" 
+            android:id="@+id/goodsPolicyPrice" 
+            android:layout_width="wrap_content" 
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal"
+            />
+    	</TableRow>
+    	<TableRow 
+    	    android:layout_width="match_parent" 
+    	    android:layout_height="wrap_content" 
+    	    android:clickable="true" 
+    	    android:id="@+id/tableRow5" 
+    	    android:padding="10dip">   
+        <TextView 
+            android:text="备注："
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" 
+            android:textSize="20dip"
+            /> 
+        <EditText 
+            android:layout_weight="1" 
+            android:id="@+id/EditText_Remark" 
+            android:layout_width="wrap_content" 
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            />
+    	</TableRow>
+    	
+   		<TableRow 
+    	    android:layout_width="match_parent" 
+    	    android:layout_height="wrap_content" 
+    	    android:clickable="true" 
+    	    android:id="@+id/tableRow4" 
+    	    android:padding="10dip">   
+    	    
+        <Button
+            android:id="@+id/SelectBatchNo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择批号" />
+        
+         <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"  android:layout_weight="1">
+        <TextView
+            android:id="@+id/BatchNo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            
+             />
+        <TextView
+            android:id="@+id/BatchNo_ID"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+             />
+        </LinearLayout>
+       </TableRow>
+    </TableLayout>    
+</LinearLayout>  
\ No newline at end of file
diff --git a/res/layout/goods_multiselect_item.xml b/res/layout/goods_multiselect_item.xml
new file mode 100644
index 0000000..4b8c706
--- /dev/null
+++ b/res/layout/goods_multiselect_item.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal" >
+
+    <CheckBox
+        android:id="@+id/CheckBox_Star"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@drawable/only_checked_star_checkbox"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/TextView_Name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextView_Code"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <CheckBox
+        android:id="@+id/CheckBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/head.xml b/res/layout/head.xml
new file mode 100644
index 0000000..490c99d
--- /dev/null
+++ b/res/layout/head.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- ListView的头部 -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" 
+	android:layout_height="wrap_content">
+
+	<!-- 内容 -->
+	<RelativeLayout android:layout_width="fill_parent"
+		android:layout_height="wrap_content" 
+		android:id="@+id/head_contentLayout"
+		android:paddingLeft="30dp">
+
+		<!-- 箭头图像、进度条 -->
+		<FrameLayout android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_alignParentLeft="true"
+			android:layout_centerVertical="true">
+
+			<!-- 箭头 -->
+			<ImageView android:layout_width="wrap_content"
+				android:layout_height="wrap_content" 
+				android:layout_gravity="center"
+				android:src="@drawable/arrow" 
+				android:id="@+id/head_arrowImageView" />
+
+			<!-- 进度条 -->
+			<ProgressBar android:layout_width="wrap_content"
+				android:layout_height="wrap_content" 
+				style="?android:attr/progressBarStyleSmall"
+				android:layout_gravity="center" 
+				android:id="@+id/head_progressBar"
+				android:visibility="gone" />
+		</FrameLayout>
+
+		<!-- 提示、最近更新 -->
+		<LinearLayout android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_centerHorizontal="true"
+			android:orientation="vertical" 
+			android:gravity="center_horizontal">
+
+			<!-- 提示 -->
+			<TextView android:layout_width="wrap_content"
+				android:layout_height="wrap_content" 
+				android:text="下拉刷新"
+				android:textColor="@color/white" 
+				android:textSize="20sp"
+				android:id="@+id/head_tipsTextView" />
+
+			<!-- 最近更新 -->
+			<TextView android:layout_width="wrap_content"
+				android:layout_height="wrap_content" 
+				android:id="@+id/head_lastUpdatedTextView"
+				android:text="上次更新" 
+				android:textColor="@color/gold"
+				android:textSize="10sp" />
+		</LinearLayout>
+	</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/mobileadjustgoodsbill_detail_edit.xml b/res/layout/mobileadjustgoodsbill_detail_edit.xml
new file mode 100644
index 0000000..bee2c87
--- /dev/null
+++ b/res/layout/mobileadjustgoodsbill_detail_edit.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/TextView_Goods_Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="存货名称"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="报价数量"
+            android:textAppearance="?android:attr/textAppearanceLarge" 
+            
+            />
+			
+        <EditText
+            android:id="@+id/EditText_Number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal" >
+
+            <requestFocus />
+        </EditText>
+    </LinearLayout>
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_OK"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="确定" />
+
+        <Button
+            android:id="@+id/Button_Cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="取消" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/mobileadjustgoodsbill_edit.xml b/res/layout/mobileadjustgoodsbill_edit.xml
new file mode 100644
index 0000000..33491c4
--- /dev/null
+++ b/res/layout/mobileadjustgoodsbill_edit.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="保存" />
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="审核" />
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="删除" />
+    </LinearLayout>    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="调出客户:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/AdjustOutBuyerName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/SelectAdjustOutBuyer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+        
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="调入客户:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/AdjustInBuyerName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/SelectAdjustInBuyer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+        
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:text="调出日期:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/AdjustGoodsBill_Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="点击选择日期"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="摘要:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <EditText
+            android:id="@+id/AdjustGoodsBill_EditText_Remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+        </EditText>       
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Button_SelectRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="明细"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="("
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/AdjustGoodsBill_TextView_DetailCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="280px"
+            android:text="0"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=")"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+ 		<TextView
+            android:id="@+id/AdjustGoodsBill_TextView_DetailNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+             />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Button_SelectGoods"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="添加存货" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/Order_ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/mobileadjustgoodsbill_list.xml b/res/layout/mobileadjustgoodsbill_list.xml
new file mode 100644
index 0000000..1ad067c
--- /dev/null
+++ b/res/layout/mobileadjustgoodsbill_list.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_Refresh"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="刷新" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+                <Spinner
+                    android:id="@+id/Spinner_BillStateFilter"
+                    android:layout_width="90dp"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/adjustgoodsbill_billstate" />
+        
+        <Spinner
+            android:id="@+id/Spinner_Filter"
+            android:layout_width="90dp"
+            android:layout_height="wrap_content"
+            android:entries="@array/orderlist_search" />
+
+        <Button
+            android:id="@+id/Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="调出时间"
+            android:text="" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/mobileadjustgoodsbill_main.xml b/res/layout/mobileadjustgoodsbill_main.xml
new file mode 100644
index 0000000..2bbbd56
--- /dev/null
+++ b/res/layout/mobileadjustgoodsbill_main.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <Button
+        android:id="@+id/Button_Main_MobileAdjustGoodsBillEdit"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="手机调货单新建" />
+
+    <Button
+        android:id="@+id/Button_Main_MobileAdjustGoodsBillList"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="手机调货单列表" />
+    
+
+    <Button
+        android:id="@+id/Button_Main_MobileAdjustGoodsBillSetUserProfile"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="手机调货单个性设置" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/mobileadjustgoodsbill_setuserprofile.xml b/res/layout/mobileadjustgoodsbill_setuserprofile.xml
new file mode 100644
index 0000000..478c506
--- /dev/null
+++ b/res/layout/mobileadjustgoodsbill_setuserprofile.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+
+<LinearLayout 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+      <Button         
+       android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:id="@+id/mobileadjustgoodsbill_SetUser_Ruturn"        
+        android:text="返回" />
+        
+    <Button         
+       android:layout_width="wrap_content"
+        android:layout_height="50dp"   
+        android:id="@+id/mobileadjustgoodsbill_SetUser_Save"        
+        android:text="保存" />
+
+    </LinearLayout>
+    
+    
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="会计单位 :" />
+
+    <Spinner
+        android:id="@+id/order_setuser_setaccountunit"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+
+     
+</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/order_detail_edit.xml b/res/layout/order_detail_edit.xml
new file mode 100644
index 0000000..0a18b34
--- /dev/null
+++ b/res/layout/order_detail_edit.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/TextView_Goods_Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="存货名称"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="数量"
+            android:textAppearance="?android:attr/textAppearanceLarge" 
+            
+            />
+			
+        <EditText
+            android:id="@+id/EditText_Number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal" >
+
+            <requestFocus />
+        </EditText>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="辅数量"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:id="@+id/TextView_SecondNumber"
+             />
+
+        <EditText
+            android:id="@+id/EditText_SecondNumber"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal" >
+
+           <requestFocus />
+        </EditText>
+    </LinearLayout>
+	 <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/priceLayout"
+         >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="价格"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <EditText
+            android:id="@+id/EditText_Price"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal" >
+
+            <requestFocus />
+        </EditText>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/remarkLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="备注"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <EditText
+            android:id="@+id/EditText_Remark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text" >
+
+            <requestFocus />
+        </EditText>
+    </LinearLayout>
+
+     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/batchNoLayout"
+         >
+
+     <Button
+            android:id="@+id/SelectBatchNo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择批号" />
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"  android:layout_weight="1">
+        <TextView
+            android:id="@+id/BatchNo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            
+             />
+        <TextView
+            android:id="@+id/BatchNo_ID"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+             />
+        </LinearLayout>        
+    </LinearLayout>
+     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+          android:id="@+id/policyPriceLayout"
+         >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="政策价格"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextView_PolicyPrice"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            />
+
+        
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_OK"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="确定" />
+
+        <Button
+            android:id="@+id/Button_Cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="取消" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/order_edit.xml b/res/layout/order_edit.xml
new file mode 100644
index 0000000..74bab23
--- /dev/null
+++ b/res/layout/order_edit.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <!-- 使EditText不自动得到焦点 -->
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Order_Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+
+        <Button
+            android:id="@+id/Order_Button_Save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="保存" />
+
+        <Button
+            android:id="@+id/Order_Button_Check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="审核" />
+
+        <Button
+            android:id="@+id/Order_Button_UnCheck"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="撤销" />
+        
+        <Button
+            android:id="@+id/Order_Button_Delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="删除" />
+    </LinearLayout>
+<LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/accountingUnitUI"
+        android:visibility="gone"
+         >
+
+        <TextView
+            android:id="@+id/Order_TextView_AccountingUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/Order_Button_SelectAccountingUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择会计单位" />
+        
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/storeUI"
+        android:visibility="gone"
+         >
+
+        <TextView
+            android:id="@+id/Order_TextView_Store"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/Order_Button_SelectStore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择仓库" />
+        
+    </LinearLayout>
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="客户:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/Order_TextView_BuyerName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/Order_Button_SelectBuyer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+        
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/balanceLayout"
+        >
+		<TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="客户往来余额:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView	
+            android:id="@+id/Order_TextView_Balance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:text="到货日期:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/Order_Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="点击选择日期"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="摘要:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <EditText
+            android:id="@+id/Order_EditText_Remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+        </EditText>
+
+        <TextView
+            android:id="@+id/Order_TextView_Remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/Order_Button_SelectRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="明细"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="("
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/Order_TextView_DetailCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="280px"
+            android:text="0"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=")"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/Order_Button_SelectGoods"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="添加存货" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/Order_ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/order_edit_detail_list_item.xml b/res/layout/order_edit_detail_list_item.xml
new file mode 100644
index 0000000..4c36332
--- /dev/null
+++ b/res/layout/order_edit_detail_list_item.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/Goods_Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="存货名称"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" 
+        >
+
+        <TextView
+            android:id="@+id/Number"
+            android:layout_weight="1.0"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="数量"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+		 <TextView
+            android:id="@+id/SecondNumber"
+            android:layout_weight="1.0"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="辅数量"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            android:id="@+id/Price"
+            android:layout_weight="1.0"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="单价"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            android:id="@+id/BatchNo"
+            android:layout_weight="1.0"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="批号"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/order_list.xml b/res/layout/order_list.xml
new file mode 100644
index 0000000..6db1770
--- /dev/null
+++ b/res/layout/order_list.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+      <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+ 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+ 
+        <Spinner
+            android:id="@+id/Spinner_BillStateFilter"
+            android:layout_width="120dp"
+            android:layout_height="50dp"
+            android:entries="@array/orderlist_billstate" />
+              <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Spinner
+            android:id="@+id/Spinner_OrderBy"
+            android:layout_width="120dp"
+            android:layout_height="50dp"
+            android:entries="@array/orderlist_OrderBy" />
+              <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+<LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+                    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="到货日期"
+            android:text="" />
+              <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_EndDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="到货结束日期"
+            android:text="" />
+                <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+                      <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_UpPage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="上一页" />
+      <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_NextPage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="下一页" />
+              <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
+    </ListView>    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/order_list_item.xml b/res/layout/order_list_item.xml
new file mode 100644
index 0000000..ea755b2
--- /dev/null
+++ b/res/layout/order_list_item.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="NO."
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="   ￥"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/TextView_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Date" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/TextView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/TextView_BillState"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Date" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/order_main.xml b/res/layout/order_main.xml
new file mode 100644
index 0000000..a590462
--- /dev/null
+++ b/res/layout/order_main.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <!-- 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+    </LinearLayout>
+     -->
+
+    <Button
+        android:id="@+id/Button_Main_OrderEdit"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="订单新建" />
+
+    <Button
+        android:id="@+id/Button_Main_OrderList"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="订单列表" />    
+        <Button
+        android:id="@+id/Button_Main_OrderProfileSet"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="订单个性设置" />    
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/order_setuserprofile.xml b/res/layout/order_setuserprofile.xml
new file mode 100644
index 0000000..d4479c5
--- /dev/null
+++ b/res/layout/order_setuserprofile.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+
+<LinearLayout 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+      <Button         
+       android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:id="@+id/Order_SetUser_Ruturn"        
+        android:text="返回" />
+        
+    <Button         
+       android:layout_width="wrap_content"
+        android:layout_height="50dp"   
+        android:id="@+id/Order_SetUser_Save"        
+        android:text="保存" />
+
+    </LinearLayout>
+    
+    
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="会计单位 :" />
+
+    <Spinner
+        android:id="@+id/order_setuser_setaccountunit"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+
+     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="系统标识 :" />
+
+    <Spinner
+        android:id="@+id/order_setuser_setSystemSign"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="提货方式 :" />
+
+    <Spinner
+        android:id="@+id/order_setuser_setTakeGoods_Type"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+    
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="销售类型 :" />
+
+    <Spinner
+        android:id="@+id/order_setuser_setSaleType"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+
+     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="运费结算方式 :" />
+
+    <Spinner
+        android:id="@+id/order_setuser_setOrderCarriageManner"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+    
+     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="运费承担方 :" />
+
+    <Spinner
+        android:id="@+id/order_setuser_setOrderFarePayer"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/remaingoods_edit.xml b/res/layout/remaingoods_edit.xml
new file mode 100644
index 0000000..54e8260
--- /dev/null
+++ b/res/layout/remaingoods_edit.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Return"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="返回" />
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Save"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="保存" />
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Check"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="审核" />
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Delete"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="删除" />
+    </LinearLayout>
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="客户:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/BuyerName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/SelectBuyer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+        
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+        
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:text="日期:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/AdjustGoodsBill_Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="点击选择日期"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="摘要:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <EditText
+            android:id="@+id/Order_EditText_Remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+        </EditText>
+
+        <TextView
+            android:id="@+id/Order_TextView_Remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/Order_Button_SelectRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="明细"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="("
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/AdjustGoodsBill_TextView_DetailCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="280px"
+            android:text="0"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=")"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+ 		<TextView
+            android:id="@+id/AdjustGoodsBill_TextView_DetailNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+             />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/AdjustGoodsBill_Button_SelectGoods"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="添加存货" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/Order_ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/remaingoods_list.xml b/res/layout/remaingoods_list.xml
new file mode 100644
index 0000000..ea5e7a2
--- /dev/null
+++ b/res/layout/remaingoods_list.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_Refresh"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="刷新" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+                <Spinner
+                    android:id="@+id/Spinner_BillStateFilter"
+                    android:layout_width="90dp"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/orderlist_billstate" />
+        
+        <Spinner
+            android:id="@+id/Spinner_Filter"
+            android:layout_width="90dp"
+            android:layout_height="wrap_content"
+            android:entries="@array/orderlist_search" />
+
+        <Button
+            android:id="@+id/Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="单据时间"
+            android:text="" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/remaingoods_main.xml b/res/layout/remaingoods_main.xml
new file mode 100644
index 0000000..9f78e0e
--- /dev/null
+++ b/res/layout/remaingoods_main.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".RemainGoods.RemainGoodsMainActivity" >
+
+    <Button
+        android:id="@+id/Button_Main_RemainGoodsEdit"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="门店留货单新建" />
+
+    <Button
+        android:id="@+id/Button_Main_RemainGoodsList"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="门店留货单列表" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_detail_edit.xml b/res/layout/return_detail_edit.xml
new file mode 100644
index 0000000..cdf38f8
--- /dev/null
+++ b/res/layout/return_detail_edit.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/TextView_Goods_Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="存货名称"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="数量"
+            android:textAppearance="?android:attr/textAppearanceLarge" 
+            
+            />
+			
+        <EditText
+            android:id="@+id/EditText_Number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal" >
+
+            <requestFocus />
+        </EditText>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_OK"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="确定" />
+
+        <Button
+            android:id="@+id/Button_Cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="取消" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_edit.xml b/res/layout/return_edit.xml
new file mode 100644
index 0000000..b36feb7
--- /dev/null
+++ b/res/layout/return_edit.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <!-- 使EditText不自动得到焦点 -->
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+<!-- 
+        <Button
+            android:id="@+id/Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+ -->
+        <Button
+            android:id="@+id/Return_Button_Save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="保存" />
+
+        <Button
+            android:id="@+id/Return_Button_Check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="审核" />
+
+        <Button
+            android:id="@+id/Return_Button_Delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="删除" />
+    </LinearLayout>
+
+    <!-- android:textAppearance="?android:attr/textAppearanceLarge" -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="购货客户:"
+             />
+
+        <TextView
+            android:id="@+id/Return_TextView_BuyerName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+             />
+
+        <Button
+            android:id="@+id/Return_Button_SelectBuyer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+        
+    </LinearLayout>
+
+        <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="出库单号:"
+             />
+
+        <TextView
+            android:id="@+id/Return_TextView_SaleOutStore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+             />
+
+        <Button
+            android:id="@+id/Return_Button_SaleOutStore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+    </LinearLayout>
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:text="退货日期:"
+             />
+
+        <TextView
+            android:id="@+id/Return_Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="点击选择日期"
+             />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="摘要:"
+             />
+
+        <EditText
+            android:id="@+id/Return_EditText_Remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+        </EditText>
+
+        <TextView
+            android:id="@+id/Return_TextView_Remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+             />
+        
+        <Button
+            android:id="@+id/Return_Button_SelectRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="选择" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="存货明细"
+             />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="("
+             />
+
+        <TextView
+            android:id="@+id/Return_TextView_DetailCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+             />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=")"
+             />
+        
+        <TextView
+            android:id="@+id/Return_TextView_DetailNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+             />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/Return_Button_SelectGoods"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="添加存货" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/Return_ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_edit_detail_list_item.xml b/res/layout/return_edit_detail_list_item.xml
new file mode 100644
index 0000000..802acb3
--- /dev/null
+++ b/res/layout/return_edit_detail_list_item.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/Goods_Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="存货名称"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/Number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="数量"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/Price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="单价"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_list.xml b/res/layout/return_list.xml
new file mode 100644
index 0000000..cf4bf92
--- /dev/null
+++ b/res/layout/return_list.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Button_Refresh"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="刷新" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+                <Spinner
+                    android:id="@+id/Spinner_BillStateFilter"
+                    android:layout_width="90dp"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/orderlist_billstate" />
+        
+        <Spinner
+            android:id="@+id/Spinner_Filter"
+            android:layout_width="90dp"
+            android:layout_height="wrap_content"
+            android:entries="@array/orderlist_search" />
+
+        <Button
+            android:id="@+id/Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="退货日期"
+            android:text="" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_main.xml b/res/layout/return_main.xml
new file mode 100644
index 0000000..227cb80
--- /dev/null
+++ b/res/layout/return_main.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <Button
+        android:id="@+id/Button_Main_ReturnEdit"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="退货登记新建" />
+
+    <Button
+        android:id="@+id/Button_Main_ReturnList"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="退货登记列表" />
+    
+    <Button
+        android:id="@+id/Button_Main_ReturnSetUserProfile"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="退货登记个性设置" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_selectgoods.xml b/res/layout/return_selectgoods.xml
new file mode 100644
index 0000000..e3a137b
--- /dev/null
+++ b/res/layout/return_selectgoods.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <EditText
+            android:id="@+id/EditText_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/Button_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="搜索" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
+    </ListView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center" >
+
+        <Button
+            android:id="@+id/Button_OK"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="确定" />
+
+        <Button
+            android:id="@+id/Button_Cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="取消" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_selectsaleoutstore.xml b/res/layout/return_selectsaleoutstore.xml
new file mode 100644
index 0000000..56e3f85
--- /dev/null
+++ b/res/layout/return_selectsaleoutstore.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <EditText
+            android:id="@+id/SaleOutStore_EditText_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/SaleOutStore_Button_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="搜索" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/SaleOutStore_ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
+    </ListView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center" >
+
+        <Button
+            android:id="@+id/SaleOutStore_Button_OK"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="确定" />
+
+        <Button
+            android:id="@+id/SaleOutStore_Button_Cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="取消" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_selectsaleoutstore_listview.xml b/res/layout/return_selectsaleoutstore_listview.xml
new file mode 100644
index 0000000..1d717fe
--- /dev/null
+++ b/res/layout/return_selectsaleoutstore_listview.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal" >
+    
+    <TextView 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="出库单:"       
+        />
+    <TextView 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/return_selectsaleoutstore_listview_id"
+        android:layout_weight="1"
+        />
+    
+    <TextView 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/return_selectsaleoutstore_listview_goodsname"
+        android:layout_weight="3"
+        />
+    
+        <TextView 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/return_selectsaleoutstore_listview_price"
+        android:layout_weight="2"
+        />
+        
+       <CheckBox 
+           android:id="@+id/return_selectsaleoutstore_listview_check"
+            android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false" 
+           />  
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/return_setuserprofile.xml b/res/layout/return_setuserprofile.xml
new file mode 100644
index 0000000..065eac5
--- /dev/null
+++ b/res/layout/return_setuserprofile.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+
+<LinearLayout 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+      <Button         
+       android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:id="@+id/Return_SetUser_Ruturn"        
+        android:text="返回" />
+        
+    <Button         
+       android:layout_width="wrap_content"
+        android:layout_height="50dp"   
+        android:id="@+id/Return_SetUser_Save"        
+        android:text="保存" />
+
+    </LinearLayout>
+    
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="部门:" />
+
+    <Spinner
+        android:id="@+id/return_setuser_setdept"        
+        android:layout_height="50dp"
+        android:layout_width="250dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="仓库:" />
+
+    <Spinner
+        android:id="@+id/return_setuser_setstore"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="退货类型:" />
+
+    <Spinner
+        android:id="@+id/return_setuser_setreturntype"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="会计单位 :" />
+
+    <Spinner
+        android:id="@+id/return_setuser_setaccountunit"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="退货处理方式:" />
+
+    <Spinner
+        android:id="@+id/return_setuser_sethandletype"
+        android:layout_width="250dp" 
+        android:layout_height="50dp" />
+
+
+</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/saleoutstore_edit.xml b/res/layout/saleoutstore_edit.xml
new file mode 100644
index 0000000..636178e
--- /dev/null
+++ b/res/layout/saleoutstore_edit.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <!-- 使EditText不自动得到焦点 -->
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <Button
+            android:id="@+id/Order_Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+ 
+    </LinearLayout>
+  
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="客户:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/Order_TextView_BuyerName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+        
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/balanceLayout"
+        >
+		<TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="编码:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView	
+            android:id="@+id/Order_TextView_BuyerCode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:text="发货箱数:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView	
+            android:id="@+id/Order_TextView_WrappageAllNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:text="到货日期:"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/Order_Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" 
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="明细"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="("
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/Order_TextView_DetailCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="280px"
+            android:text="0"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=")"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.05" />
+ 
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/Order_ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/saleoutstore_edit_detail_list_item.xml b/res/layout/saleoutstore_edit_detail_list_item.xml
new file mode 100644
index 0000000..a47fa8c
--- /dev/null
+++ b/res/layout/saleoutstore_edit_detail_list_item.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/Goods_Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="存货名称"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" 
+        >
+
+        <TextView
+            android:id="@+id/Number"
+            android:layout_weight="1.0"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="数量"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+ 
+        <TextView
+            android:id="@+id/Price"
+            android:layout_weight="1.0"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="单价"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            android:id="@+id/Money"
+            android:layout_weight="1.0"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="金额"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/saleoutstore_list.xml b/res/layout/saleoutstore_list.xml
new file mode 100644
index 0000000..d1c4e6c
--- /dev/null
+++ b/res/layout/saleoutstore_list.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+      <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+ 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+ 
+        <Spinner
+            android:id="@+id/Spinner_BillStateFilter"
+            android:layout_width="120dp"
+            android:layout_height="50dp"
+            android:entries="@array/orderlist_billstate" />
+              <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Spinner
+            android:id="@+id/Spinner_OrderBy"
+            android:layout_width="120dp"
+            android:layout_height="50dp"
+            android:entries="@array/orderlist_OrderBy" />
+              <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+<LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+                    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="到货日期"
+            android:text="" />
+              <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_EndDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="到货结束日期"
+            android:text="" />
+                <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+                      <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_UpPage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="上一页" />
+      <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/Button_NextPage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="下一页" />
+              <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
+    </ListView>    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/saleoutstore_list_item.xml b/res/layout/saleoutstore_list_item.xml
new file mode 100644
index 0000000..ea755b2
--- /dev/null
+++ b/res/layout/saleoutstore_list_item.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="NO."
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="   ￥"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/TextView_Date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Date" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/TextView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/TextView_BillState"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Date" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/saleoutstore_main.xml b/res/layout/saleoutstore_main.xml
new file mode 100644
index 0000000..5570350
--- /dev/null
+++ b/res/layout/saleoutstore_main.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+ 
+
+    <Button
+        android:id="@+id/Button_Main_saleoutstoreList"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="出库单列表" />    
+   
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/selectbatchno.xml b/res/layout/selectbatchno.xml
new file mode 100644
index 0000000..97c8cea
--- /dev/null
+++ b/res/layout/selectbatchno.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <EditText
+            android:id="@+id/EditText_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="5" >
+
+            <requestFocus />
+        </EditText>
+
+        <Button
+            android:id="@+id/Button_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="搜索" />
+
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/selectbuyer.xml b/res/layout/selectbuyer.xml
new file mode 100644
index 0000000..434747f
--- /dev/null
+++ b/res/layout/selectbuyer.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <EditText
+            android:id="@+id/EditText_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="5" >
+
+            <requestFocus />
+        </EditText>
+
+        <Button
+            android:id="@+id/Button_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="搜索" />
+
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/selectgoods.xml b/res/layout/selectgoods.xml
new file mode 100644
index 0000000..ddc8970
--- /dev/null
+++ b/res/layout/selectgoods.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <EditText
+            android:id="@+id/EditText_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/Button_Search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="搜索" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
+    </ListView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center" >
+
+        <Button
+            android:id="@+id/Button_OK"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="确定" />
+
+        <Button
+            android:id="@+id/Button_Cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="取消" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/selectremark.xml b/res/layout/selectremark.xml
new file mode 100644
index 0000000..c330c27
--- /dev/null
+++ b/res/layout/selectremark.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <EditText
+            android:id="@+id/EditText_Remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/Button_Save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="保存" />
+
+        <Spinner
+            android:id="@+id/Spinner_Filter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/ListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/usermassage.xml b/res/layout/usermassage.xml
new file mode 100644
index 0000000..4f37aa8
--- /dev/null
+++ b/res/layout/usermassage.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+                <Button
+            android:id="@+id/Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+    <ListView
+        android:id="@+id/userMessageListView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
+    </ListView>        
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/usermassage_detail.xml b/res/layout/usermassage_detail.xml
new file mode 100644
index 0000000..69ef865
--- /dev/null
+++ b/res/layout/usermassage_detail.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+            <Button
+            android:id="@+id/Button_Return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="返回" />
+    <LinearLayout 
+    android:layout_width="match_parent"
+    android:layout_height="20dp"
+    android:orientation="horizontal">"
+     <TextView
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:text="发信人:"
+        />
+
+   <TextView
+       android:id="@+id/TextView_Sender"
+       android:layout_width="wrap_content"
+       android:layout_height="20dp"
+       android:text="TextView"
+        />
+   </LinearLayout>
+       <LinearLayout 
+    android:layout_width="match_parent"
+    android:layout_height="20dp"
+    android:orientation="horizontal">
+     <TextView
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:text="发送时间:"
+        />
+
+   <TextView
+       android:id="@+id/TextView_SenderTime"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:text="Date"
+        />
+   </LinearLayout>
+     <LinearLayout 
+    android:layout_width="match_parent"
+    android:layout_height="20dp"
+    android:orientation="horizontal">
+     <TextView
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:text="消息类型:"
+        />
+
+   <TextView
+       android:id="@+id/TextView_Category"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:text="TextView"
+        />
+   </LinearLayout>
+        <LinearLayout 
+    android:layout_width="match_parent"
+    android:layout_height="20dp"
+    android:orientation="horizontal">
+   		     <TextView
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:text="内容:"
+        />
+   </LinearLayout>
+   <ScrollView
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       >
+     <TextView
+       android:id="@+id/TextView_Content"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:text="TextView"
+        />
+	</ScrollView>
+
+   
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/usermessage_list_item.xml b/res/layout/usermessage_list_item.xml
new file mode 100644
index 0000000..92ad426
--- /dev/null
+++ b/res/layout/usermessage_list_item.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="NO."
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/TextViewID"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+ 
+        <TextView
+            android:id="@+id/TextView_SentTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Date"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:layout_marginLeft="20dp"
+		/>
+ 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        
+    </LinearLayout>
+    <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" >
+        <TextView
+            android:id="@+id/TextView_Sender"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView" 
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            />
+        <TextView
+            android:id="@+id/TextView_Category"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView" 
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:layout_marginLeft="20dp"
+            />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/color.xml b/res/values/color.xml
new file mode 100644
index 0000000..151f060
--- /dev/null
+++ b/res/values/color.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="red">#FF0000</color>
+    <color name="white">#ffffff</color>
+    <color name="transparent">#00000000</color>
+    <color name="gold">#b89766</color>
+    <color name="backgroud">#d0d0d0</color>
+    <color name="textColor">#D0D0D0</color>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
new file mode 100644
index 0000000..ac92230
--- /dev/null
+++ b/res/values/strings.xml
@@ -0,0 +1,47 @@
+<resources>
+
+    <string name="app_name">青花瓷手机客户端</string>    
+
+    <string name="createTable_ClientGoods">create table ClientGoods(ID integer primary key,
+		Code text,Name text,Spell Text)
+</string>
+    <string name="createTable_ClientBuyer">		create table ClientBuyer(ID integer primary key,
+		Code text,Name text,Spell Text)
+</string>
+    <string name="sql_createServerHistory"></string>
+
+    <string-array name="search_starred_options">
+        <item>所有</item>
+        <item>已收藏</item>
+        <item>未收藏</item>
+    </string-array>
+    <string-array name="orderlist_search">
+        <item>当天</item>
+        <item>最近2天</item>
+        <item>最近3天</item>
+        <item>最后30条</item>
+    </string-array>
+    <string-array name="orderlist_billstate">
+        <item>未审核</item>
+        <item>已审核</item>
+        <item>所有</item>
+    </string-array>
+     <string-array name="adjustgoodsbill_billstate">
+        <item>未审核</item>
+        <item>已转帐单</item>
+    </string-array>        
+    <string-array name="orderlist_OrderBy">
+        <item>降序</item>
+        <item>升序</item>
+    </string-array> 
+	<string-array name="planets_array">
+        <item></item>
+        <item>退货拉回</item>
+        <item>丢弃或销毁</item>        
+    </string-array>
+    	<string-array name="chinapay_suc">
+        <item></item>
+        <item>成功</item>
+        <item>失败</item>        
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..fc595a7
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <style name="AppTheme" parent="android:Theme.Light" />
+
+
+
+</resources>
\ No newline at end of file
diff --git a/src/BWP/MobileSale/Approval/ApprovalEditActivity.java b/src/BWP/MobileSale/Approval/ApprovalEditActivity.java
new file mode 100644
index 0000000..ed8ef53
--- /dev/null
+++ b/src/BWP/MobileSale/Approval/ApprovalEditActivity.java
@@ -0,0 +1,315 @@
+package BWP.MobileSale.Approval;
+
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.GestureDetector;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.animation.AnimationUtils;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.ViewFlipper;
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.MainActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+
+public class ApprovalEditActivity extends LoginedActivity implements
+		OnGestureListener {
+	private GestureDetector detector;
+	private ViewFlipper flipper;
+
+	private View currentView;
+
+	static final int RequestCode_Open = 99; // 打开单据
+
+	private long mBillID;
+	private long mNextEnableApproveBillID;
+	private RpcObject mDmo;
+
+	private boolean mEnableApprove = true;
+
+	private TextView textViewOpinion;
+	private TextView textViewApprovalContents;
+	private TextView textViewApprovalRecord;
+
+	@Override
+	public boolean dispatchTouchEvent(MotionEvent ev) {
+		detector.onTouchEvent(ev);
+		return super.dispatchTouchEvent(ev);
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		// Log.i("Fling", "Activity onTouchEvent!");
+		return this.detector.onTouchEvent(event);
+	}
+
+	@Override
+	public boolean onDown(MotionEvent e) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/**
+	 * 监听滑动
+	 */
+	@Override
+	public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+			float velocityY) {
+		// TODO Auto-generated method stub
+		// Log.i("Fling", "Fling Happened!");
+		if (e1.getX() - e2.getX() > 120) {// 左滑
+			this.flipper.setInAnimation(AnimationUtils.loadAnimation(this,
+					R.anim.push_left_in));
+			this.flipper.setOutAnimation(AnimationUtils.loadAnimation(this,
+					R.anim.push_left_out));
+			this.flipper.showNext();
+			Utils.ActivityUtil.Go(ApprovalEditActivity.this, MainActivity.class);
+			finish();
+			return true;
+		} else if (e1.getX() - e2.getX() < -120) {// 右滑
+			this.flipper.setInAnimation(AnimationUtils.loadAnimation(this,
+					R.anim.push_right_in));
+			this.flipper.setOutAnimation(AnimationUtils.loadAnimation(this,
+					R.anim.push_right_out));
+			this.flipper.showPrevious();
+			Utils.ActivityUtil.Go(ApprovalEditActivity.this, ApprovalListActivity.class);
+			finish();
+			return true;
+		}
+		return true;
+	}
+
+	@Override
+	public void onLongPress(MotionEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
+			float distanceY) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void onShowPress(MotionEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean onSingleTapUp(MotionEvent e) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	private void applyToUI() {
+		if (mDmo == null) {
+			DialogUtil.Alert(ApprovalEditActivity.this, "当前可编辑的对象为空");
+			finish();
+			return;
+		}
+
+		if (mBillID > 0) {
+			this.setTitle(String.format("%s-签呈单No.%s(%s)",
+					getString(R.string.app_name), mBillID,
+					mDmo.getNamedValue("BillState")));
+		}
+
+		textViewOpinion.setText("");
+		textViewApprovalContents.setText(mDmo.getString("ApprovalContents"));
+		textViewApprovalRecord.setText(mDmo.getString("ApprovalRecord"));
+
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.approval_edit_flipper);
+
+		View listView = LayoutInflater.from(this).inflate(
+				R.layout.approval_list, null);
+		currentView = LayoutInflater.from(this).inflate(R.layout.approval_edit,
+				null);
+		LinearLayout mayLayout = GetVLayoutWithBackgroud();
+//		View mainView = new MainActivity().mainLayout();
+		// View mainView = LayoutInflater.from(this).inflate(R.layout.main,
+		// null);
+
+		flipper = (ViewFlipper) this.findViewById(R.id.ViewFlipper1);
+		flipper.addView(listView);
+		flipper.addView(currentView);
+		flipper.addView(mayLayout);
+		flipper.showNext();
+		detector = new GestureDetector(this);
+
+		Intent intent = getIntent();
+		mBillID = intent.getLongExtra("ID", 0);
+
+		initBillTask.execute();
+
+	}
+
+	private LinearLayout GetVLayoutWithBackgroud(){
+		LinearLayout vLayout=new LinearLayout(ApprovalEditActivity.this);
+		vLayout.setOrientation(LinearLayout.VERTICAL);
+		vLayout.setLayoutParams(new LinearLayout.LayoutParams(
+				LinearLayout.LayoutParams.MATCH_PARENT,
+				LinearLayout.LayoutParams.MATCH_PARENT));
+		vLayout.setBackgroundResource(R.drawable.bg2);
+		return vLayout;
+	}
+	
+	private void initControls() {
+		InitButtonAgree();
+		InitButtonReject();
+		InitOpinion();
+
+		InitApprovalContents();
+		InitApprovalRecord();
+
+	}
+
+	private void InitButtonAgree() {
+		if (!mEnableApprove)
+			return;
+
+		Button buttonAgree = ActivityUtil.Find(this, R.id.ApprovalButton_Agree);
+		buttonAgree.setOnClickListener(agreeTask);
+	}
+
+	private void InitButtonReject() {
+		if (!mEnableApprove)
+			return;
+
+		Button buttonList = ActivityUtil.Find(this, R.id.ApprovalButton_Reject);
+		buttonList.setOnClickListener(rejectTask);
+	}
+
+	private void InitOpinion() {
+		textViewOpinion = ActivityUtil
+				.Find(this, R.id.ApprovalEditText_Opinion);
+		if (!mEnableApprove) {
+			textViewOpinion.setVisibility(View.GONE);
+		}
+	}
+
+	private void InitApprovalContents() {
+		textViewApprovalContents = ActivityUtil.Find(this,
+				R.id.ApprovalextView_ApprovalContents);
+	}
+
+	private void InitApprovalRecord() {
+		textViewApprovalRecord = ActivityUtil.Find(this,
+				R.id.ApprovalTextView_ApprovalRecord);
+	}
+
+	CallableTask initBillTask = new CallableTask(this, "读取单据中...") {
+		public Object call() throws Exception {
+			if (mBillID > 0) {
+				String method = "/Breed/Approval/Rpcs/MobileApprovalRpc/Load";
+				mDmo = RpcFacade.rpcCall(method, mBillID);
+
+				method = "/Breed/Approval/Rpcs/MobileApprovalRpc/EnableApprove";
+				mEnableApprove = RpcFacade.rpcCall(method);
+
+			} else {
+				mDmo = RpcObject.create("/Breed/Approval/BO/SignSubmit");
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			initControls();
+			applyToUI();
+		}
+
+	};
+
+	ViewOnClickTask agreeTask = new ViewOnClickTask(this, "审批中...") {
+		public Object call() throws Exception {
+			String opinion = textViewOpinion.getText().toString();
+			String method = "/Breed/Approval/Rpcs/MobileApprovalRpc/ApproveAndGetNextID";
+			mNextEnableApproveBillID = RpcFacade.rpcCall(method, mBillID, opinion);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(ApprovalEditActivity.this, "审批成功");
+			finish();
+			Intent intent = new Intent();
+			if (mNextEnableApproveBillID > 0) {
+				intent.putExtra("ID", mNextEnableApproveBillID);
+				intent.setClass(ApprovalEditActivity.this,
+						ApprovalEditActivity.class);
+				startActivityIfNeeded(intent,
+						ApprovalEditActivity.RequestCode_Open);
+			} else {
+				// TODO:
+			}
+
+		}
+	};
+
+	ViewOnClickTask rejectTask = new ViewOnClickTask(this, "驳回中...") {
+		public Object call() throws Exception {
+			String opinion = textViewOpinion.getText().toString();
+			String method = "/Breed/Approval/Rpcs/MobileApprovalRpc/RejectAndGetNextID";
+			mNextEnableApproveBillID = RpcFacade.rpcCall(method, mBillID, opinion);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(ApprovalEditActivity.this, "驳回成功");
+			finish();
+			Intent intent = new Intent();
+			if (mNextEnableApproveBillID > 0) {
+				intent.putExtra("ID", mNextEnableApproveBillID);
+				intent.setClass(ApprovalEditActivity.this,
+						ApprovalEditActivity.class);
+				startActivityIfNeeded(intent,
+						ApprovalEditActivity.RequestCode_Open);
+			} else {
+				// TODO:
+			}
+
+		}
+	};
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		switch (keyCode) {
+		case KeyEvent.KEYCODE_BACK:
+			DialogUtil.Confirm(this, "您按了返回按钮,是否返回?", "是", "否",
+					new android.content.DialogInterface.OnClickListener() {
+
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							finish();
+						}
+
+					});
+			return false;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+
+}
diff --git a/src/BWP/MobileSale/Approval/ApprovalListActivity.java b/src/BWP/MobileSale/Approval/ApprovalListActivity.java
new file mode 100644
index 0000000..d6ba6e0
--- /dev/null
+++ b/src/BWP/MobileSale/Approval/ApprovalListActivity.java
@@ -0,0 +1,176 @@
+package BWP.MobileSale.Approval;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.MainActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DialogUtil;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.AdapterView.OnItemClickListener;
+
+public class ApprovalListActivity extends LoginedActivity {
+
+	ListView listView;
+	private SimpleAdapter adapter;
+
+	class SumInfo {
+		public int RowCount;
+
+		@Override
+		public String toString() {
+			return String.format("共%s条记录", RowCount);
+		}
+
+	}
+
+	SumInfo mSumInfo = new SumInfo();
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		// TODO Auto-generated method stub
+		super.onActivityResult(requestCode, resultCode, data);
+
+		switch (requestCode) {
+		case ApprovalEditActivity.RequestCode_Open:
+			StartQuery();
+			break;
+		}
+	}
+
+	String[] columnNames = new String[] { "Staff_Name", "Title" };
+
+	int[] columnIDs = new int[] { R.id.approvalStaffView,
+			R.id.approvalTitleView };
+
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Breed/Approval/Rpcs/MobileApprovalRpc/Search";
+			RpcObject argument = RpcObject
+					.create("/Breed/Approval/Rpcs/RpcSearch");
+
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			mSumInfo.RowCount = rows.size();
+
+			adapter = new SimpleAdapter(ApprovalListActivity.this, rows,
+					R.layout.approval_list_item, columnNames, columnIDs);
+
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+
+	};
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "刷新");
+		menu.add(0, 2, 1, "统计");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Menu.FIRST:
+			StartQuery();
+			break;
+		case 2:
+			DialogUtil.Alert(this, mSumInfo.toString());
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.approval_list);
+
+		initButtonWaitingApproval();
+		// initButtonMore();
+		initButtonReturn();
+		initListView();
+
+		StartQuery();
+	}
+
+	private void initButtonWaitingApproval() {
+		ActivityUtil.FindButton(this, R.id.Approval_Button_WaitingApproval)
+				.setOnClickListener(new OnClickListener() {
+
+					public void onClick(View v) {
+						StartQuery();
+					}
+				});
+	}
+
+	// private void initButtonMore() {
+	//  ActivityUtil.FindButton(this, R.id.Approval_Button_More)
+	//  .setOnClickListener(new OnClickListener() {
+	// 
+	//  public void onClick(View v) {
+	//
+	//  }
+	//  });
+	// }
+
+	private void initButtonReturn() {
+		ActivityUtil.FindButton(this, R.id.Approval_Button_Return)
+				.setOnClickListener(new OnClickListener() {
+					public void onClick(View v) {
+						Utils.ActivityUtil.Go(ApprovalListActivity.this,
+								MainActivity.class);
+						finish();
+					}
+				});
+	}
+
+	private void initListView() {
+		listView = ActivityUtil.Find(this, R.id.ApprovalListView);
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("ID", (Long) map.get("ID"));
+				intent.setClass(arg1.getContext(), ApprovalEditActivity.class);
+				startActivityForResult(intent,
+						ApprovalEditActivity.RequestCode_Open);
+				finish();
+			}
+
+		});
+	}
+
+	private void StartQuery() {
+		searchTask.execute();
+	}
+
+}
diff --git a/src/BWP/MobileSale/BackRunTask.java b/src/BWP/MobileSale/BackRunTask.java
new file mode 100644
index 0000000..1a86b17
--- /dev/null
+++ b/src/BWP/MobileSale/BackRunTask.java
@@ -0,0 +1,75 @@
+package BWP.MobileSale;
+
+import java.util.concurrent.Callable;
+
+import android.os.AsyncTask;
+import android.util.Log;
+
+public abstract class BackRunTask implements Callable<Object>{
+
+    final String tag = "BackRunTask";
+	
+	Boolean mIsRunning = false;	
+	
+	protected void onTaskPreExecute()
+	{
+		
+	}
+	protected void onTaskPostExecute()
+	{
+		
+	}
+	protected void onTaskCancelled()
+	{
+		
+	}
+	
+	public  void execute()
+	{
+		if(mIsRunning){
+			Log.w(tag, "重复任务");
+			System.out.println("重复任务");
+			return;
+		}
+		new Task().execute();
+	}
+	
+	
+	class Task extends AsyncTask<Void,Void,Void>
+	{
+
+		@Override
+		protected Void doInBackground(Void... params) {
+			try {
+				mIsRunning=true;
+				call();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return null;
+		}
+
+		@Override
+		protected void onCancelled() {
+			super.onCancelled();
+			onTaskCancelled();
+		}
+
+		@Override
+		protected void onPostExecute(Void result) {
+			super.onPostExecute(result);
+			onTaskPostExecute();
+		}
+
+		@Override
+		protected void onPreExecute() {
+			super.onPreExecute();
+			onTaskPreExecute();
+		}
+
+	
+		
+	}
+	
+	
+}
diff --git a/src/BWP/MobileSale/BranchOrder/BranchOrderEditActivity.java b/src/BWP/MobileSale/BranchOrder/BranchOrderEditActivity.java
new file mode 100644
index 0000000..f8e4121
--- /dev/null
+++ b/src/BWP/MobileSale/BranchOrder/BranchOrderEditActivity.java
@@ -0,0 +1,582 @@
+package BWP.MobileSale.BranchOrder;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+public class BranchOrderEditActivity extends LoginedActivity {
+
+	long mBillId;
+	private RpcObject mDmo;
+	private BigDecimal loadShijiFaHuo = BigDecimal.ZERO;
+	private BigDecimal loadBenRiXiaoShou = BigDecimal.ZERO;
+	private BigDecimal loadSunHao = BigDecimal.ZERO;
+	static final int RequestCode_Open = 3; // 打开单据
+	boolean isUnCheck = true;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.branchorder_edit);
+		Intent intent = getIntent();
+		mBillId = intent.getLongExtra("ID", 0);
+		initBillTask.execute();
+	}
+
+	CallableTask initBillTask = new CallableTask(this, "读取数据中...") {
+
+		@Override
+		public Object call() throws Exception {
+			if (mBillId > 0) {
+				String method = "/Sale/BranchOrder/Rpcs/MobileBranchOrderRpc/Load";
+				mDmo = RpcFacade.rpcCall(method, mBillId);
+				isUnCheck = mDmo.getNamedValue("BillState").getValue() == 0;
+
+			} else {
+				DialogUtil.AlertAndFinish(BranchOrderEditActivity.this,
+						"没有传入单据号");
+			}
+
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			initControls();
+			applyToUI();
+			setVisibility();
+		}
+
+	};
+
+	private void setVisibility() {
+
+		if (isUnCheck) {
+			return;
+		}
+		btnSave.setVisibility(View.GONE);
+
+	}
+
+	Button btnSave, btnReturn;
+	TextView tvBuyername, tvDeptname, tvBilldate, tvTodaymoney, tvLeftmoney;
+	TextView tvSunhaolv, tvSunhao, tvShijifahuo, tvTodaysale,
+			tvYestodayleftmoney, tvloadBoxNumber, remainMoney;
+
+	EditText etTiaohuo, etYinhangshuaka, etTihuojuan, etFanli, etJiesuandan,
+			etXianjin, etBenrijine, etZhidanren, etZhaiyao, etChuzhika,
+			etchangkuan, youhuijuan, huiyuanka, returnBoxNumber,
+			emptyBoxNumber;
+	EditText etWx, etZfb, etDzdp, etNuomi, etShoukuanka;
+	EditText etChangduan, etMeituanWaimai, etBaiduWaimai, etEleme;
+	private void initControls() {
+
+		initTextView();
+		initEditText();
+
+		btnReturn = (Button) findViewById(R.id.branchorder_btnreturn);
+		btnReturn.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		btnSave = (Button) findViewById(R.id.branchorder_btnsave);
+		btnSave.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				try {
+					getFromUi();
+					saveTask.execute();
+
+				} catch (Exception e) {
+					DialogUtil.Alert(BranchOrderEditActivity.this,
+							e.getLocalizedMessage());
+				}
+
+			}
+		});
+
+	}
+
+	ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") {
+		public Object call() throws Exception {
+
+			if (mBillId > 0) {
+				String method = "/Sale/BranchOrder/Rpcs/MobileBranchOrderRpc/Update";
+				RpcFacade.rpcCall(method, mDmo);
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(BranchOrderEditActivity.this, "保存成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillId);
+			intent.setClass(BranchOrderEditActivity.this,
+					BranchOrderEditActivity.class);
+			startActivityIfNeeded(intent,
+					BranchOrderEditActivity.RequestCode_Open);
+		}
+
+	};
+
+	private BigDecimal getDecimalValue(TextView view) {
+		if (StringUtil.IsNullOrEmpty(view.getText().toString())) {
+			return BigDecimal.ZERO;
+		} else {
+			return new BigDecimal(view.getText().toString());
+		}
+
+	}
+
+	private BigDecimal getDecimalValue(EditText view) {
+
+		if (StringUtil.IsNullOrEmpty(view.getText().toString())) {
+			return BigDecimal.ZERO;
+		} else {
+			return new BigDecimal(view.getText().toString());
+		}
+
+	}
+
+	private void getFromUi() {
+		// 实际发货
+		mDmo.setMoney("RealityLoadMoney", getDecimalValue(tvShijifahuo));
+
+		// 损耗
+		mDmo.setMoney("LossMoney", getDecimalValue(tvSunhao));
+
+		// 本日销售
+		mDmo.setMoney("TodaySaleMoney", getDecimalValue(tvTodaysale));
+
+		// 调货
+		mDmo.setMoney("AdjustMoney", getDecimalValue(etTiaohuo));
+
+		// 银行刷卡
+		mDmo.setMoney("BankCard", getDecimalValue(etYinhangshuaka));
+
+		// 提货券
+		mDmo.setMoney("GetGoodsTicket", getDecimalValue(etTihuojuan));
+
+		// 返利
+		mDmo.setMoney("ReturnMoney", getDecimalValue(etFanli));
+
+		// 结算单
+		mDmo.setMoney("StatPayMoney", getDecimalValue(etJiesuandan));
+
+		// 现金
+		mDmo.setMoney("ReadyMoney", getDecimalValue(etXianjin));
+		mDmo.setMoney("WxMoney", getDecimalValue(etWx));
+		mDmo.setMoney("ZfbMoney", getDecimalValue(etZfb));
+		mDmo.setMoney("DzdpMoney", getDecimalValue(etDzdp));
+
+		mDmo.setMoney("Nuomi", getDecimalValue(etNuomi));
+		mDmo.setMoney("Shoukuanka", getDecimalValue(etShoukuanka));
+		mDmo.setMoney("Changduan", getDecimalValue(etChangduan));		
+		mDmo.setMoney("MeituanWaimai", getDecimalValue(etMeituanWaimai));
+		mDmo.setMoney("BaiduWaimai", getDecimalValue(etBaiduWaimai));
+		mDmo.setMoney("Eleme", getDecimalValue(etEleme));			
+		// 本日余额
+		mDmo.setMoney("TodayLeftMoney", getDecimalValue(etBenrijine));
+
+		// 储值卡
+		mDmo.setMoney("MoneyCard", getDecimalValue(etChuzhika));
+
+		// 长款
+		mDmo.setMoney("LongMoney", getDecimalValue(etchangkuan));
+
+		// 会员卡
+		mDmo.setMoney("MembershipCard", getDecimalValue(huiyuanka));
+
+		// 优惠券
+		mDmo.setMoney("Coupons", getDecimalValue(youhuijuan));
+
+		// 空箱数
+		mDmo.setMoney("EmptyBoxNumber", getDecimalValue(emptyBoxNumber));
+
+		// 发货箱数
+		mDmo.setMoney("LoadBoxNumber", getDecimalValue(tvloadBoxNumber));
+
+		// 留货金额
+		mDmo.setMoney("RemainGoodsMoney", getDecimalValue(remainMoney));
+
+		// 退货箱数
+		mDmo.setMoney("ReturnBoxNumber", getDecimalValue(returnBoxNumber));
+
+		// 制单人
+		mDmo.setString("CreateBillUser", etZhidanren.getText().toString());
+
+		// 摘要
+		mDmo.setString("Remark", etZhaiyao.getText().toString());
+
+	}
+
+	private void initTextView() {
+		tvBuyername = (TextView) findViewById(R.id.branchorder_buyername);
+		tvDeptname = (TextView) findViewById(R.id.branchorder_deptname);
+		tvBilldate = (TextView) findViewById(R.id.branchorder_billdate);
+		// tvYesterdaymoney = (TextView)
+		// findViewById(R.id.branchorder_yesterdaymoney);// 昨日余额
+		tvTodaymoney = (TextView) findViewById(R.id.branchorder_todaymoney);// 本日发货
+		tvLeftmoney = (TextView) findViewById(R.id.branchorder_leftmoney);// 摊点剩货
+		tvSunhaolv = (TextView) findViewById(R.id.branchorder_sunhaolv);
+		tvSunhao = (TextView) findViewById(R.id.branchorder_sunhao);
+		tvShijifahuo = (TextView) findViewById(R.id.branchorder_shijifahuo);
+		tvTodaysale = (TextView) findViewById(R.id.branchorder_todaysale);
+		tvYestodayleftmoney = (TextView) findViewById(R.id.branchorder_yestodayleftmoney);// 昨日余额
+		tvloadBoxNumber = (TextView) findViewById(R.id.branchorder_edit_LoadBoxNumber);
+		remainMoney = (TextView) findViewById(R.id.branchorder_edit_RemainMoney);
+	}
+
+	private void initEditText() {
+		etTiaohuo = (EditText) findViewById(R.id.branchorder_edit_tiaohuo);
+		if (!mDmo.getBoolean("IsOrNotEditAdjustMoney")) {
+			etTiaohuo.setEnabled(false);
+		} else {
+			etTiaohuo.addTextChangedListener(new TextWatcher() {
+
+				@Override
+				public void onTextChanged(CharSequence s, int start,
+						int before, int count) {
+					// System.out.println("onTextChanged---s="+s+"-start="+start+"-before="+before+"-count="+count);
+					if (etTiaohuo.hasFocus()) {
+						try {
+							if (s == null
+									|| StringUtil.IsNullOrEmpty(s.toString())
+									|| s.toString().equals("-")
+									|| s.toString().equals("+")) {
+								if (loadShijiFaHuo != BigDecimal.ZERO) {
+									tvShijifahuo.setText(loadShijiFaHuo
+											.toString());
+								}
+								if (loadSunHao != BigDecimal.ZERO) {
+									tvSunhao.setText(loadSunHao.toString());
+								}
+								if (loadBenRiXiaoShou != BigDecimal.ZERO) {
+									tvTodaysale.setText(loadBenRiXiaoShou
+											.toString());
+								}
+								return;
+							}
+
+							BigDecimal 本日发货 = BigDecimal.ZERO;
+							if (!StringUtil.IsNullOrEmpty(tvTodaymoney
+									.getText().toString())) {
+								本日发货 = new BigDecimal((String) tvTodaymoney
+										.getText()).setScale(2,
+										BigDecimal.ROUND_HALF_UP);
+							}
+
+							BigDecimal 昨日余额 = BigDecimal.ZERO;
+							if (!StringUtil.IsNullOrEmpty(tvYestodayleftmoney
+									.getText().toString())) {
+								昨日余额 = new BigDecimal(
+										(String) tvYestodayleftmoney.getText())
+										.setScale(2, BigDecimal.ROUND_HALF_UP);
+							}
+
+							BigDecimal 实际发货 = new BigDecimal(s.toString())
+									.add(昨日余额).add(本日发货)
+									.setScale(2, BigDecimal.ROUND_HALF_UP);
+
+							// 实际发货
+							tvShijifahuo.setText(""
+									+ 实际发货.setScale(2, BigDecimal.ROUND_HALF_UP));
+							// 损耗
+							BigDecimal 损耗 = BigDecimal.ZERO;
+							if (!StringUtil.IsNullOrEmpty(tvSunhaolv.getText()
+									.toString())) {
+								损耗 = (new BigDecimal(tvTodaymoney.getText()
+										.toString()).add(new BigDecimal(
+										etTiaohuo.getText().toString())))
+										.multiply(new BigDecimal(tvSunhaolv
+												.getText().toString()));
+								;
+								tvSunhao.setText(损耗.setScale(2,
+										BigDecimal.ROUND_HALF_UP).toString());
+							}
+							// 本日销售
+							BigDecimal 摊点剩货 = BigDecimal.ZERO;
+							if (!StringUtil.IsNullOrEmpty(tvLeftmoney.getText()
+									.toString())) {
+								摊点剩货 = new BigDecimal(tvLeftmoney.getText()
+										.toString());
+							}
+							BigDecimal 本日库存额 = BigDecimal.ZERO;
+							if (!StringUtil.IsNullOrEmpty(etBenrijine.getText()
+									.toString())) {
+								本日库存额 = new BigDecimal(etBenrijine.getText()
+										.toString());
+							}
+							BigDecimal 本日销售 = 实际发货
+									.subtract(摊点剩货)
+									.subtract(
+											损耗.setScale(2,
+													BigDecimal.ROUND_HALF_UP))
+									.subtract(本日库存额);
+							tvTodaysale.setText(本日销售.setScale(2,
+									BigDecimal.ROUND_HALF_UP).toString());
+
+						} catch (Exception e) {
+							DialogUtil.Alert(BranchOrderEditActivity.this,
+									e.getMessage());
+						}
+					}
+				}
+
+				@Override
+				public void beforeTextChanged(CharSequence s, int start,
+						int count, int after) {
+					// System.out.println("beforeTextChanged---s="+s+"-start="+start+"-after="+after+"-count="+count);
+				}
+
+				@Override
+				public void afterTextChanged(Editable s) {
+					// System.out.println("afterTextChanged---s="+s);
+				}
+			});
+		}
+		etYinhangshuaka = (EditText) findViewById(R.id.branchorder_edit_yinhangshuaka);
+		etTihuojuan = (EditText) findViewById(R.id.branchorder_edit_tihuojuan);
+		etFanli = (EditText) findViewById(R.id.branchorder_edit_fanli);
+		etJiesuandan = (EditText) findViewById(R.id.branchorder_edit_jiesuandan);
+		etXianjin = (EditText) findViewById(R.id.branchorder_edit_xianjin);
+		etDzdp = (EditText) findViewById(R.id.branchorder_edit_dzdp);	
+		etWx = (EditText) findViewById(R.id.branchorder_edit_wx);
+		etZfb = (EditText) findViewById(R.id.branchorder_edit_zfb);			
+
+		etNuomi = (EditText) findViewById(R.id.branchorder_edit_Nuomi);	
+		etShoukuanka = (EditText) findViewById(R.id.branchorder_edit_Shoukuanka);
+		etChangduan = (EditText) findViewById(R.id.branchorder_edit_Changduan);			
+		etMeituanWaimai = (EditText) findViewById(R.id.branchorder_edit_MeituanWaimai);	
+		etBaiduWaimai = (EditText) findViewById(R.id.branchorder_edit_BaiduWaimai);
+		etEleme = (EditText) findViewById(R.id.branchorder_edit_Eleme);	
+		
+		if (!mDmo.getBoolean("CanEditNuomi")) {
+			etNuomi.setEnabled(false);
+		}
+		if (!mDmo.getBoolean("CanEditShoukuanka")) {
+			etShoukuanka.setEnabled(false);
+		}
+		if (!mDmo.getBoolean("CanEditChangduan")) {
+			etChangduan.setEnabled(false);
+		}
+		if (!mDmo.getBoolean("CanEditMeituanWaimai")) {
+			etMeituanWaimai.setEnabled(false);
+		}
+		if (!mDmo.getBoolean("CanEditBaiduWaimai")) {
+			etBaiduWaimai.setEnabled(false);
+		}
+		if (!mDmo.getBoolean("CanEditEleme")) {
+			etEleme.setEnabled(false);
+		}
+		
+		if (!mDmo.getBoolean("CanEditReadyMoney")) {
+			etXianjin.setEnabled(false);
+		}		
+		if (!mDmo.getBoolean("CanEditWxMoney")) {
+			etWx.setEnabled(false);
+		}		
+		if (!mDmo.getBoolean("CanEditZfbMoney")) {
+			etZfb.setEnabled(false);
+		}		
+		if (!mDmo.getBoolean("CanEditDzdpMoney")) {
+			etDzdp.setEnabled(false);
+		}		
+		if (!mDmo.getBoolean("CanEditBankCard")) {
+			etYinhangshuaka.setEnabled(false);
+		}		
+		if (!mDmo.getBoolean("CanEditGetGoodsTicket")) {
+			etTihuojuan.setEnabled(false);
+		}		
+ 
+		etBenrijine = (EditText) findViewById(R.id.branchorder_edit_benrijine);
+		if (!mDmo.getBoolean("IsOrNotEditTodayLeftMoney")) {
+			etBenrijine.setEnabled(false);
+		}
+		etZhidanren = (EditText) findViewById(R.id.branchorder_edit_zhidanren);
+		etZhaiyao = (EditText) findViewById(R.id.branchorder_edit_zhaiyao);
+		etChuzhika = (EditText) findViewById(R.id.branchorder_edit_chuzhika);
+		etchangkuan = (EditText) findViewById(R.id.branchorder_edit_changkuan);
+		huiyuanka = (EditText) findViewById(R.id.branchorder_edit_huiyuanka);
+		youhuijuan = (EditText) findViewById(R.id.branchorder_edit_youhuijuan);
+		returnBoxNumber = (EditText) findViewById(R.id.ranchorder_edit_ReturnBoxNumber);
+		emptyBoxNumber = (EditText) findViewById(R.id.branchorder_edit_EmptyBoxNumber);
+		
+		if (!mDmo.getBoolean("CanEditMoneyCard")) {
+			etChuzhika.setEnabled(false);
+		}		
+		if (!mDmo.getBoolean("CanEditLongMoney")) {
+			etchangkuan.setEnabled(false);
+		}		
+		if (!mDmo.getBoolean("CanEditMembershipCard")) {
+			huiyuanka.setEnabled(false);
+		}
+
+		if (!mDmo.getBoolean("CanEditCoupons")) {
+			youhuijuan.setEnabled(false);
+		}
+		
+		
+		
+	}
+
+	private void applyToUI() {
+		if (mDmo == null) {
+			DialogUtil.Alert(BranchOrderEditActivity.this, "当前可编辑的对象为空");
+			finish();
+			return;
+		}
+
+		this.setTitle(String.format("门店日结No.%s", mBillId));
+		tvBuyername.setText(mDmo.getString("Buyer_Name"));
+		tvDeptname.setText(mDmo.getString("Dept_Name"));
+		// tvBilldate.setText(DateTimeUtil.FormatDate(mDmo.getDate("BillDate")));
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(mDmo.getDate("BillDate"));
+		calendar.add(Calendar.DATE, 0);
+		try {
+			Date date = DateTimeUtil.ParseDate(DateTimeUtil
+					.FormatDate(calendar));
+			tvBilldate.setText(DateTimeUtil.FormatDate(date));
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+
+		if (mDmo.getMoney("TodayLoadMoney") != null) {
+			tvTodaymoney.setText(mDmo.getMoney("TodayLoadMoney").toString());
+		}
+		if (mDmo.getMoney("LeftMoney") != null) {
+			tvLeftmoney.setText(mDmo.getMoney("LeftMoney").toString());
+		}
+
+		if (mDmo.getDecimal("LossRate") != null) {
+			tvSunhaolv.setText(mDmo.getDecimal("LossRate").toString());
+		}
+		if (mDmo.getMoney("LossMoney") != null) {
+			tvSunhao.setText(mDmo.getMoney("LossMoney").toString());
+			loadSunHao = mDmo.getMoney("LossMoney");
+		}
+		if (mDmo.getMoney("RealityLoadMoney") != null) {
+			tvShijifahuo.setText(mDmo.getMoney("RealityLoadMoney").toString());
+			loadShijiFaHuo = mDmo.getMoney("RealityLoadMoney");
+		}
+		if (mDmo.getMoney("TodaySaleMoney") != null) {
+			tvTodaysale.setText(mDmo.getMoney("TodaySaleMoney").toString());
+			loadBenRiXiaoShou = mDmo.getMoney("TodaySaleMoney");
+
+		}
+ 
+		if (mDmo.getMoney("YesterdayLeftMoney") != null) {
+			tvYestodayleftmoney.setText(mDmo.getMoney("YesterdayLeftMoney")
+					.toString());
+		}
+
+		if (mDmo.getMoney("AdjustMoney") != null) {
+			etTiaohuo.setText(mDmo.getMoney("AdjustMoney").toString());
+		}
+		if (mDmo.getMoney("BankCard") != null) {
+			etYinhangshuaka.setText(mDmo.getMoney("BankCard").toString());
+		}
+		if (mDmo.getMoney("GetGoodsTicket") != null) {
+			etTihuojuan.setText(mDmo.getMoney("GetGoodsTicket").toString());
+		}
+		if (mDmo.getMoney("ReturnMoney") != null) {
+			etFanli.setText(mDmo.getMoney("ReturnMoney").toString());
+		}
+		if (mDmo.getMoney("StatPayMoney") != null) {
+			etJiesuandan.setText(mDmo.getMoney("StatPayMoney").toString());
+		}
+		if (mDmo.getMoney("ReadyMoney") != null) {
+			etXianjin.setText(mDmo.getMoney("ReadyMoney").toString());
+		}
+		if (mDmo.getMoney("WxMoney") != null) {
+			etWx.setText(mDmo.getMoney("WxMoney").toString());
+		}		
+		if (mDmo.getMoney("ZfbMoney") != null) {
+			etZfb.setText(mDmo.getMoney("ZfbMoney").toString());
+		}	
+		if (mDmo.getMoney("DzdpMoney") != null) {
+			etDzdp.setText(mDmo.getMoney("DzdpMoney").toString());
+		}	
+
+		if (mDmo.getMoney("Nuomi") != null) {
+			etNuomi.setText(mDmo.getMoney("Nuomi").toString());
+		}		
+		if (mDmo.getMoney("Shoukuanka") != null) {
+			etShoukuanka.setText(mDmo.getMoney("Shoukuanka").toString());
+		}	
+		if (mDmo.getMoney("Changduan") != null) {
+			etChangduan.setText(mDmo.getMoney("Changduan").toString());
+		}
+		if (mDmo.getMoney("MeituanWaimai") != null) {
+			etMeituanWaimai.setText(mDmo.getMoney("MeituanWaimai").toString());
+		}		
+		if (mDmo.getMoney("BaiduWaimai") != null) {
+			etBaiduWaimai.setText(mDmo.getMoney("BaiduWaimai").toString());
+		}	
+		if (mDmo.getMoney("Eleme") != null) {
+			etEleme.setText(mDmo.getMoney("Eleme").toString());
+		}		
+		
+		if (mDmo.getMoney("TodayLeftMoney") != null) {
+			etBenrijine.setText(mDmo.getMoney("TodayLeftMoney").toString());
+		}
+		if (mDmo.getMoney("MoneyCard") != null) {
+			etChuzhika.setText(mDmo.getMoney("MoneyCard").toString());
+		}
+		if (mDmo.getMoney("LongMoney") != null) {
+			etchangkuan.setText(mDmo.getMoney("LongMoney").toString());
+		}
+		if (mDmo.getMoney("Coupons") != null) {
+			youhuijuan.setText(mDmo.getMoney("Coupons").toString());
+		}
+		if (mDmo.getMoney("MembershipCard") != null) {
+			huiyuanka.setText(mDmo.getMoney("MembershipCard").toString());
+		}
+		if (mDmo.getMoney("LoadBoxNumber") != null) {
+			tvloadBoxNumber.setText(mDmo.getMoney("LoadBoxNumber").toString());
+		}
+		if (mDmo.getMoney("RemainGoodsMoney") != null) {
+			remainMoney.setText(mDmo.getMoney("RemainGoodsMoney").toString());
+		}
+		if (mDmo.getMoney("ReturnBoxNumber") != null) {
+			returnBoxNumber
+					.setText(mDmo.getMoney("ReturnBoxNumber").toString());
+		}
+		if (mDmo.getMoney("EmptyBoxNumber") != null) {
+			emptyBoxNumber.setText(mDmo.getMoney("EmptyBoxNumber").toString());
+		}
+		etZhidanren.setText(mDmo.getString("CreateBillUser"));
+		etZhaiyao.setText(mDmo.getString("Remark"));
+
+	}
+
+}
\ No newline at end of file
diff --git a/src/BWP/MobileSale/BranchOrder/BranchOrderListView.java b/src/BWP/MobileSale/BranchOrder/BranchOrderListView.java
new file mode 100644
index 0000000..38cfbb6
--- /dev/null
+++ b/src/BWP/MobileSale/BranchOrder/BranchOrderListView.java
@@ -0,0 +1,58 @@
+package BWP.MobileSale.BranchOrder;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BranchOrderListView {
+
+	private long ID;
+	private String BuyerName; // 内容
+	private BigDecimal TodayLoadMoney;
+	private BigDecimal DiffReadyMoney;
+	private Date BillDate;
+
+	@Override
+	public String toString() {
+		// TODO Auto-generated method stub
+		return super.toString();
+	}
+	
+	public long getID() {
+		return ID;
+	}
+	public void setID(long id) {
+		this.ID = id;
+	}
+
+	public String getBuyerName() {
+		return BuyerName;
+	}
+	public void setBuyerName(String buyername) {
+		this.BuyerName = buyername;
+	}
+	
+	public BigDecimal getTodayLoadMoney()
+	{
+		return this.TodayLoadMoney;
+	}
+	public void setTodayLoadMoney(BigDecimal todayLoadMoney)
+	{
+		this.TodayLoadMoney=todayLoadMoney;
+	}
+	public BigDecimal getDiffReadyMoney()
+	{
+		return this.DiffReadyMoney;
+	}
+	public void setDiffReadyMoney(BigDecimal diffReadyMoney)
+	{
+		this.DiffReadyMoney=diffReadyMoney;
+	}
+	public Date getBillDate()
+	{
+		return this.BillDate;
+	}
+	public void setBillDate(Date billDate)
+	{
+		this.BillDate=billDate;
+	}
+}
diff --git a/src/BWP/MobileSale/BranchOrder/BranchOrderListViewAdapter.java b/src/BWP/MobileSale/BranchOrder/BranchOrderListViewAdapter.java
new file mode 100644
index 0000000..b6cde79
--- /dev/null
+++ b/src/BWP/MobileSale/BranchOrder/BranchOrderListViewAdapter.java
@@ -0,0 +1,121 @@
+package BWP.MobileSale.BranchOrder;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.StringUtil;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+public class BranchOrderListViewAdapter extends BaseAdapter {
+
+	List<Long> itemsid;
+	List<BranchOrderListView> Items;
+	private LayoutInflater inflater;
+
+	// public BranchOrderListViewAdapter(List<BranchOrderListView> items) {
+	// this.Items = items;
+	// }
+
+	public BranchOrderListViewAdapter(List<BranchOrderListView> items,
+			Context context) {
+
+		super();
+		this.Items = items;
+		this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+		
+		itemsid=new ArrayList<Long>();
+		setItemsId();
+	}
+
+	private void setItemsId()
+	{
+		for (Iterator iterator = Items.iterator(); iterator.hasNext();) {
+			BranchOrderListView item = (BranchOrderListView) iterator.next();
+			itemsid.add(item.getID());
+		}
+	}
+	
+	@Override
+	public int getCount() {
+		return Items.size();
+
+	}
+
+	@Override
+	public Object getItem(int position) {
+		return Items.get(position);
+
+	}
+
+	@Override
+	public long getItemId(int position) {
+		return position;
+
+	}
+
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		if (convertView == null) {
+			convertView = inflater
+					.inflate(R.layout.branchorder_listinner, null);
+		}
+
+		TextView txtID = (TextView) convertView.findViewById(R.id.TextView_ID);
+		txtID.setText(Long.toString(Items.get(position).getID()));
+
+		TextView txtBuyerName = (TextView) convertView
+				.findViewById(R.id.TextView_Buyer);
+		txtBuyerName.setText(Items.get(position).getBuyerName());
+
+		TextView txtBillDate = (TextView) convertView
+				.findViewById(R.id.TextView_BillDate);
+		txtBillDate.setText(DateTimeUtil.FormatDate(Items.get(position)
+				.getBillDate()));
+
+		TextView txtDiffReadyMoney = (TextView) convertView.findViewById(R.id.TextView_DiffReadyMoney);
+		if(Items.get(position).getDiffReadyMoney()!=null)
+		{
+			txtDiffReadyMoney.setText(Items.get(position).getDiffReadyMoney().toString());
+		}
+		else
+		{
+			txtDiffReadyMoney.setText("");
+		}
+		
+
+		TextView txtTodayLoadMoney = (TextView) convertView.findViewById(R.id.TextView_TodayLoadMoney);
+		if (Items.get(position).getTodayLoadMoney() != null) {
+			txtTodayLoadMoney.setText(Items.get(position).getTodayLoadMoney().toString());
+		} else {
+			txtTodayLoadMoney.setText("");
+		}
+
+		return convertView;
+	}
+
+	public void addItem(BranchOrderListView item) {
+		
+		if (!itemsid.contains(item.getID())) {			
+			Items.add(item);
+			itemsid.add(item.getID());
+		}
+
+	}
+
+	public void AddRefreshItem(BranchOrderListView item) {
+		if (!itemsid.contains(item.getID())){
+			Items.add(0, item);
+			itemsid.add(item.getID());
+		}
+		
+	}
+
+}
diff --git a/src/BWP/MobileSale/BranchOrder/BranchOrderMainActivity.java b/src/BWP/MobileSale/BranchOrder/BranchOrderMainActivity.java
new file mode 100644
index 0000000..46f5ee2
--- /dev/null
+++ b/src/BWP/MobileSale/BranchOrder/BranchOrderMainActivity.java
@@ -0,0 +1,453 @@
+package BWP.MobileSale.BranchOrder;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.BackRunTask;
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Ui.DownRefreshListView;
+import BWP.MobileSale.Ui.DownRefreshListView.OnRefreshListener;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.DialogUtil.SetDate;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.Spinner;
+import android.widget.SimpleAdapter.ViewBinder;
+import android.widget.TextView;
+
+public class BranchOrderMainActivity extends LoginedActivity implements
+		OnScrollListener {
+
+	
+	int perPageSize=20;
+	int pageIndex=0;
+	
+	int MenuRefresh = 1;
+	DownRefreshListView listView;
+	
+	String[] names = new String[] { "ID", "TodayLoadMoney", "BillDate",
+			"Buyer_Name", "DiffReadyMoney" };
+	int[] tos = new int[] { R.id.TextView_ID, R.id.TextView_TodayLoadMoney,
+			R.id.TextView_BillDate, R.id.TextView_Buyer,
+			R.id.TextView_DiffReadyMoney };
+
+	ViewBinder viewBinder = new ViewBinder() {
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.TextView_BillDate) {
+				((TextView) view).setText(DateTimeUtil.FormatDate((Date) data));
+				return true;
+			} else {
+				return false;
+			}
+		};
+	};
+
+
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.branchorder_main);
+		initFilter();
+		initButtonDate();
+		Button btnReturn=(Button)findViewById(R.id.Button_branchordermain_Return);
+		btnReturn.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		loadMoreButton = new Button(this);
+		loadMoreButton.setText("查看更多...");
+		loadMoreButton.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				loadMoreButton.setText("正在加载中..."); // 设置按钮文字
+				handler.postDelayed(new Runnable() {
+
+					@Override
+					public void run() {
+						try {
+							loadMoreData();
+							
+						} catch (JsonRpcException e) {
+							e.printStackTrace();
+						}
+						pageadapter.notifyDataSetChanged();
+						loadMoreButton.setText("查看更多..."); // 恢复按钮文字
+
+					}
+				}, 1000);
+			}
+		});
+		InitActivity();
+		//后期去掉的
+		//listView.addFooterView(loadMoreButton);
+		listView.setOnScrollListener(this);
+
+		StartSearch();
+	}
+
+	private void StartSearch() {
+		//searchTask.execute();
+		searchTask1.execute();
+	}
+
+	private void initButtonDate() {
+		buttonDate = ActivityUtil.FindButton(this, R.id.Button_Date);
+		DialogUtil.AddSelectDateDialog(buttonDate, new SetDate() {
+
+			public void setDate(Date date) {
+				StartSearch();
+			}
+
+		});
+	}
+	private void InitActivity() {
+		InitListView();
+	}
+
+	private void InitListView() {
+		listView = (DownRefreshListView) findViewById(R.id.downrefreshlist);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@Override
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				BranchOrderListView map = (BranchOrderListView) arg0.getItemAtPosition(arg2);
+				
+				
+				Intent intent = new Intent();
+				intent.putExtra("ID", map.getID());
+				intent.setClass(arg1.getContext(), BranchOrderEditActivity.class);
+				startActivity(intent);
+			}
+		});
+		
+		listView.setonRefreshListener(new OnRefreshListener() {
+			
+			@Override
+			public void onRefresh() {
+				new AsyncTask<Void, Void, Void>() {
+					protected Void doInBackground(Void... params) {
+						try {
+							
+							Thread.sleep(500);
+							
+							String method = "/Sale/BranchOrder/Rpcs/MobileBranchOrderRpc/SearchRefresh";
+							RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+							Resources resource = getResources();
+							long maxid= pageadapter.Items.get(0).getID();
+							argument.setLong("LastMaxId", maxid);
+							
+							String searchkey = (String) filter.getSelectedItem();
+							argument.setString("SearchKey", searchkey);
+						
+							argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());
+							
+							String dateText = buttonDate.getText().toString();
+							if(!StringUtil.IsNullOrEmpty(dateText)){
+								Date parseDate = DateTimeUtil.ParseDate(dateText);
+								argument.setDate("Date1", parseDate);
+							}
+							
+							
+							//pageIndex=0;
+							
+							DFDataTable table = RpcFacade.rpcCall(method, argument);
+							List<RpcObject> rows = table.getRows();
+
+						
+							for (Iterator iterator = rows.iterator(); iterator.hasNext();) {
+
+								RpcObject rpcObject = (RpcObject) iterator.next();
+
+								BranchOrderListView item = new BranchOrderListView();
+								item.setID(rpcObject.getLong("ID"));
+								item.setBuyerName(rpcObject.getString("Buyer_Name"));
+								item.setBillDate(rpcObject.getDate("BillDate"));
+								System.out.println("---"+item.getID());
+								item.setDiffReadyMoney(rpcObject.getMoney("DiffReadyMoney"));
+								item.setTodayLoadMoney(rpcObject.getMoney("TodayLoadMoney"));							
+					
+								pageadapter.AddRefreshItem(item);
+								
+							}							
+							
+							
+							
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+						
+						
+						return null;
+					}
+
+					@Override
+					protected void onPostExecute(Void result) {
+						pageadapter.notifyDataSetChanged();
+						listView.onRefreshComplete();
+					}
+
+				}.execute();
+			}
+		});
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == MenuRefresh) {
+			pageIndex=0;
+			StartSearch();
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, MenuRefresh, 0, "刷新");
+		return super.onCreateOptionsMenu(menu);
+
+	}
+
+	private void initFilter() {
+		filter = ActivityUtil.Find(this, R.id.Spinner_Filter);
+		billStateFilter = (Spinner) findViewById(R.id.Spinner_BillStateFilter);
+		
+		OnItemSelectedListener listener = new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				StartSearch();
+				
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+								
+			}
+		};
+		
+		filter.setOnItemSelectedListener(listener);
+		billStateFilter.setOnItemSelectedListener(listener);
+		
+	}
+	
+	private Button refreshMoreButton;
+	private Handler handler = new Handler();
+	private Button loadMoreButton;
+	private int visibleLastIndex = 0; // 最后的可视项索引
+	private int visibleItemCount; // 当前窗口可见项总数
+	private BranchOrderListViewAdapter pageadapter;
+	private Spinner filter;
+	private Spinner billStateFilter;
+	private Button buttonDate;
+	CallableTask searchTask1 = new CallableTask(this, "查询中...") {
+
+		@Override
+		public Object call() throws Exception {
+
+			String method = "/Sale/BranchOrder/Rpcs/MobileBranchOrderRpc/Search";
+			RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+			Resources resource = getResources();
+			argument.setInt("PageSize", perPageSize);
+			argument.setInt("PageIndex", pageIndex);
+			
+			//System.out.println("PageSize--"+perPageSize);
+			//System.out.println("PageIndex--"+pageIndex);
+			
+			String searchkey = (String) filter.getSelectedItem();
+			argument.setString("SearchKey", searchkey);
+			//System.out.println("SearchKey--"+searchkey);
+		
+			argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());
+			//System.out.println("SearchKey2--"+(String)billStateFilter.getSelectedItem());
+			
+			String dateText = buttonDate.getText().toString();
+			if(!StringUtil.IsNullOrEmpty(dateText)){
+				Date parseDate = DateTimeUtil.ParseDate(dateText);
+				argument.setDate("Date1", parseDate);
+				//System.out.println("Date1--"+DateTimeUtil.FormatDate(parseDate));
+			}
+			
+			
+			
+			pageIndex=pageIndex+1;
+			
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+
+			List<BranchOrderListView> items = new ArrayList<BranchOrderListView>();
+
+			for (Iterator iterator = rows.iterator(); iterator.hasNext();) {
+
+				RpcObject rpcObject = (RpcObject) iterator.next();
+
+				BranchOrderListView item = new BranchOrderListView();
+				item.setID(rpcObject.getLong("ID"));
+				item.setBuyerName(rpcObject.getString("Buyer_Name"));
+				//item.setBillDate(rpcObject.getDate("BillDate"));
+				//item.setBillDate(DateTimeUtil.AddDays(rpcObject.getDate("BillDate"),1) );						
+				
+				Calendar calendar = Calendar.getInstance();
+				calendar.setTime(rpcObject.getDate("BillDate"));
+				calendar.add(Calendar.DATE, 0); 				
+			
+				Date date = DateTimeUtil.ParseDate(DateTimeUtil.FormatDate(calendar));
+				item.setBillDate(date);
+				//System.out.println(DateTimeUtil.FormatDate(date));
+				
+				item.setDiffReadyMoney(rpcObject.getMoney("DiffReadyMoney"));
+				item.setTodayLoadMoney(rpcObject.getMoney("TodayLoadMoney"));
+
+				items.add(item);
+
+			}
+			pageadapter = new BranchOrderListViewAdapter(items,
+					BranchOrderMainActivity.this);
+		
+			
+			return null;
+
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(pageadapter);
+
+		}
+	};
+
+	
+	private void loadMoreData() throws JsonRpcException {
+	
+
+		String method = "/Sale/BranchOrder/Rpcs/MobileBranchOrderRpc/Search";
+		RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+		Resources resource = getResources();
+		argument.setInt("PageSize", perPageSize);
+		argument.setInt("PageIndex", pageIndex);
+		
+		String searchkey = (String) filter.getSelectedItem();
+		argument.setString("SearchKey", searchkey);
+	
+		argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());
+		
+		String dateText = buttonDate.getText().toString();
+		if(!StringUtil.IsNullOrEmpty(dateText)){
+			
+			try {
+				Date parseDate = DateTimeUtil.ParseDate(dateText);
+				argument.setDate("Date1", parseDate);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			
+		}
+		
+		
+		pageIndex=pageIndex+1;
+		
+		DFDataTable table = RpcFacade.rpcCall(method, argument);
+		List<RpcObject> rows = table.getRows();
+
+		
+//后期去掉的
+//		if(rows.isEmpty()||rows.size()<perPageSize)
+//		{
+//			listView.removeFooterView(loadMoreButton);
+//		}
+		for (Iterator iterator = rows.iterator(); iterator.hasNext();) {
+
+			RpcObject rpcObject = (RpcObject) iterator.next();
+
+			BranchOrderListView item = new BranchOrderListView();
+			item.setID(rpcObject.getLong("ID"));
+			item.setBuyerName(rpcObject.getString("Buyer_Name"));
+			
+			//item.setBillDate(DateTimeUtil.AddDays(rpcObject.getDate("BillDate"),1) );
+			Date dd=rpcObject.getDate("BillDate");
+			Calendar calendar = Calendar.getInstance();
+			calendar.set(dd.getYear(),dd.getMonth(), dd.getDay());
+			Date date = DateTimeUtil.RemoveTime(calendar.getTime());
+			item.setBillDate(date);
+			System.out.println(date);
+			item.setDiffReadyMoney(rpcObject.getMoney("DiffReadyMoney"));
+			item.setTodayLoadMoney(rpcObject.getMoney("TodayLoadMoney"));
+
+			
+			pageadapter.addItem(item);
+		}
+		
+		
+System.out.println("后台加载中结束");
+		
+	}
+
+	@Override
+	public void onScroll(AbsListView view, int firstVisibleItem,
+			int visibleItemCount, int totalItemCount) {
+
+		this.visibleItemCount = visibleItemCount;
+		visibleLastIndex = firstVisibleItem + visibleItemCount - 1;
+
+		// if(totalItemCount == datasize+1){
+		// listView.removeFooterView(loadMoreView);
+		// Toast.makeText(this, "数据全部加载完!", Toast.LENGTH_LONG).show();
+		// }
+
+	}
+
+	@Override
+	public void onScrollStateChanged(AbsListView view, int scrollState) {
+		int itemsLastIndex = pageadapter.getCount() - 1; // 数据集最后一项的索引
+		int lastIndex = itemsLastIndex + 1;
+		if (scrollState == OnScrollListener.SCROLL_STATE_IDLE
+				&& visibleLastIndex == lastIndex) {
+			// 如果是自动加载,可以在这里放置异步加载数据的代码
+		}
+	
+	}
+	
+	@Override
+	protected void onResume() {
+		pageIndex=0;
+		StartSearch();
+		super.onResume();
+	}
+}
diff --git a/src/BWP/MobileSale/BreedLog/BreedLogEditActivity.java b/src/BWP/MobileSale/BreedLog/BreedLogEditActivity.java
new file mode 100644
index 0000000..2542a7b
--- /dev/null
+++ b/src/BWP/MobileSale/BreedLog/BreedLogEditActivity.java
@@ -0,0 +1,391 @@
+package BWP.MobileSale.BreedLog;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.BranchOrder.BranchOrderEditActivity;
+import BWP.MobileSale.Return.ReturnSetUserProfileActivity;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import android.app.Activity;
+import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+public class BreedLogEditActivity extends LoginedActivity {
+
+	static final int RequestCode_Open = 3;
+	Long mBillID;
+	private boolean mEnableSave = true;
+	private RpcObject mDmo;
+	Button btnNew, btnSave;
+	Spinner spinnerAccount, spinnerFactory, spinnerBatch, spinnerCage;
+	TextView tvDate;
+	EditText txtDeadGong, txtDeadMu, txtTaoTaiGong, txtTaoTaiMu, txtEatTime,
+			txtDrinkWater;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.breedlog_edit);
+		try {
+			initSpinners();
+		} catch (JsonRpcException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		btnNew = (Button) findViewById(R.id.breedlog_edit_btnnew);
+		btnNew.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+
+				mBillID = (long) 0;
+				finish();
+				Intent intent = new Intent();
+				intent.putExtra("ID", mBillID);
+				intent.setClass(BreedLogEditActivity.this,
+						BreedLogEditActivity.class);
+				startActivity(intent);
+				// startActivityIfNeeded(intent,
+				// BreedLogEditActivity.RequestCode_Open);
+
+			}
+		});
+		btnSave = (Button) findViewById(R.id.breedlog_edit_btnsave);
+		btnSave.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				try {
+
+					getFromUi();
+
+					saveTask.execute();
+				} catch (Exception e) {
+					DialogUtil.Alert(BreedLogEditActivity.this, e.getMessage());
+
+				}
+			}
+		});
+
+		txtDeadGong = (EditText) findViewById(R.id.breedlog_edit_deadgong);
+		txtDeadMu = (EditText) findViewById(R.id.breedlog_edit_deadmu);
+		txtTaoTaiGong = (EditText) findViewById(R.id.breedlog_edit_taotaigong);
+		txtTaoTaiMu = (EditText) findViewById(R.id.breedlog_edit_taotaimu);
+		txtEatTime = (EditText) findViewById(R.id.breedlog_edit_eattime);
+		txtDrinkWater = (EditText) findViewById(R.id.breedlog_edit_drinkwater);
+		tvDate = (TextView) findViewById(R.id.breedlog_edit_date);
+
+		tvDate.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				OnDateSetListener onDateSetListener = new DatePickerDialog.OnDateSetListener() {
+
+					public void onDateSet(DatePicker datePicker, int year,
+							int month, int day) {
+						Calendar calendar = Calendar.getInstance();
+						calendar.set(year, month, day);
+						Date date = DateTimeUtil.RemoveTime(calendar.getTime());
+						tvDate.setText(DateTimeUtil.FormatDate(date));
+						// mDmo.setDate("Date", date);
+						// applyToUI();
+					}
+
+				};
+				String dateStr = tvDate.getText().toString();
+				Calendar calendar = DateTimeUtil.SafeParseCalendar(dateStr);
+
+				new DatePickerDialog(BreedLogEditActivity.this,
+						onDateSetListener, calendar.get(Calendar.YEAR),
+						calendar.get(Calendar.MONTH), calendar
+								.get(Calendar.DAY_OF_MONTH)).show();
+
+			}
+		});
+
+		Intent intent = getIntent();
+		mBillID = intent.getLongExtra("ID", 0);
+		if (mBillID == 0) {
+			Calendar c = Calendar.getInstance();
+
+			tvDate.setText(DateTimeUtil.FormatDate(c.getTime()));
+		}
+
+		initBillTask.execute();
+
+		//
+
+	}
+
+	List<String> listAccount, listFactory, listBatch, listCage;
+	Dictionary<String, Long> tableAccount, tableFactory, tableBatch, tableCage;
+
+	// =new Hashtable<String,Long>();
+	private void initSpinners() throws JsonRpcException {
+		spinnerAccount = (Spinner) findViewById(R.id.breedlog_edit_account);
+		tableAccount = new Hashtable<String, Long>();
+		listAccount = new ArrayList<String>();
+		listAccount.add("");
+		String method = "/Hatch/BreedingPoultry/Rpcs/MobileBreedLogRpc/LoadAccountintUnit";
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			String name = rpcObject.getString("Name");
+			Long id = rpcObject.getLong("ID");
+			listAccount.add(name);
+			tableAccount.put(name, id);
+		}
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+				BreedLogEditActivity.this,
+				android.R.layout.simple_spinner_item, listAccount);
+		spinnerAccount.setAdapter(adapter);
+
+		// 養殖場
+		spinnerFactory = (Spinner) findViewById(R.id.breedlog_edit_factory);
+		tableFactory = new Hashtable<String, Long>();
+		listFactory = new ArrayList<String>();
+		listFactory.add("");
+		method = "/Hatch/BreedingPoultry/Rpcs/MobileBreedLogRpc/LoadBreedFactory";
+		table = RpcFacade.rpcCall(method);
+		rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			String name = rpcObject.getString("Name");
+			Long id = rpcObject.getLong("ID");
+			listFactory.add(name);
+			tableFactory.put(name, id);
+		}
+		adapter = new ArrayAdapter<String>(BreedLogEditActivity.this,
+				android.R.layout.simple_spinner_item, listFactory);
+		spinnerFactory.setAdapter(adapter);
+		//
+
+		spinnerBatch = (Spinner) findViewById(R.id.breedlog_edit_batch);
+		tableBatch = new Hashtable<String, Long>();
+		listBatch = new ArrayList<String>();
+		listBatch.add("");
+		method = "/Hatch/BreedingPoultry/Rpcs/MobileBreedLogRpc/LoadBatch";
+		table = RpcFacade.rpcCall(method);
+		rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			String name = rpcObject.getString("Name");
+			Long id = rpcObject.getLong("ID");
+			listBatch.add(name);
+			tableBatch.put(name, id);
+		}
+		adapter = new ArrayAdapter<String>(BreedLogEditActivity.this,
+				android.R.layout.simple_spinner_item, listBatch);
+		spinnerBatch.setAdapter(adapter);
+
+		spinnerCage = (Spinner) findViewById(R.id.breedlog_edit_cage);
+		tableCage = new Hashtable<String, Long>();
+		listCage = new ArrayList<String>();
+		listCage.add("");
+		method = "/Hatch/BreedingPoultry/Rpcs/MobileBreedLogRpc/LoadBreederCage";
+		table = RpcFacade.rpcCall(method);
+		rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			String name = rpcObject.getString("Name");
+			Long id = rpcObject.getLong("ID");
+			listCage.add(name);
+			tableCage.put(name, id);
+		}
+		adapter = new ArrayAdapter<String>(BreedLogEditActivity.this,
+				android.R.layout.simple_spinner_item, listCage);
+		spinnerCage.setAdapter(adapter);
+
+	}
+
+	CallableTask initBillTask = new CallableTask(this, "读取单据中...") {
+		public Object call() throws Exception {
+			if (mBillID > 0) {
+				String method = "/Hatch/BreedingPoultry/Rpcs/MobileBreedLogRpc/LoadMobileBreedLog";
+				mDmo = RpcFacade.rpcCall(method, mBillID);
+
+				// method = "/Sale/Sale/Rpcs/MobileOrderRpc/EnableCheck";
+				// result = RpcFacade.rpcCall(method, mBillID);
+				// mEnableCheck = result.getBoolean();
+
+			} else {
+				mDmo = RpcObject
+						.create("/Hatch/BreedingPoultry/BO/MobileBreedLog");
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			mEnableSave = mDmo.getNamedValue("BillState").getValue() == 0;
+			// mEnableDelete = mDmo.getNamedValue("BillState").getValue() == 0;
+			// initControls();
+			applyToUI();
+		}
+
+	};
+
+	ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") {
+		public Object call() throws Exception {
+
+			if (mBillID > 0) {
+				String method = "/Hatch/BreedingPoultry/Rpcs/MobileBreedLogRpc/Update";
+				RpcFacade.rpcCall(method, mDmo);
+			} else {
+				String method = "/Hatch/BreedingPoultry/Rpcs/MobileBreedLogRpc/Insert";
+				mBillID = RpcFacade.rpcCall(method, mDmo);
+			}
+
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(BreedLogEditActivity.this, "保存成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(BreedLogEditActivity.this,
+					BreedLogEditActivity.class);
+			startActivityIfNeeded(intent, BreedLogEditActivity.RequestCode_Open);
+		}
+
+	};
+
+	// @Override
+	// protected void onActivityResult(int requestCode, int resultCode, Intent
+	// intent) {
+	// super.onActivityResult(requestCode, resultCode, intent);
+	// if (resultCode != Activity.RESULT_OK) {
+	// return;
+	// }
+	//
+	// switch (requestCode) {
+	// case RequestCode_SelectBuyer:
+	// ReceiveSelectBuyerResult(intent);
+	// break;
+	// case RequestCode_SelectGoods:
+	// ReceiveSelectGoodsResult(intent);
+	// break;
+	// case RequestCode_EditDetail:
+	// ReceiveEditDetail(intent);
+	// break;
+	// case RequestCode_SelectRemark:
+	// ReceiveSelectRemarkResult(intent);
+	// break;
+	// case RequestCode_SelectSaleOutStore:
+	// ReceiveSelectSaleOutStore(intent);
+	// break;
+	//
+	// }
+	// }
+
+	private void getFromUi() {
+
+		mDmo.setLong("AccountingUnit_ID",
+				tableAccount.get((String) spinnerAccount.getSelectedItem()));
+		mDmo.setLong("BreedFactory_ID",
+				tableFactory.get((String) spinnerFactory.getSelectedItem()));
+		mDmo.setLong("Batch_ID",
+				tableBatch.get((String) spinnerBatch.getSelectedItem()));
+		mDmo.setLong("BreederCage_ID",
+				tableCage.get((String) spinnerCage.getSelectedItem()));
+
+		setIntValue("DeadGong", txtDeadGong);
+		setIntValue("DeadMu", txtDeadMu);
+		setIntValue("TaoTaiGong", txtTaoTaiGong);
+		setIntValue("TaoTaiMu", txtTaoTaiMu);
+
+		mDmo.setString("EatSiLiaoDate", txtEatTime.getText().toString());
+		mDmo.setDecimal("DrinkWater", getDecimalValue(txtEatTime));
+		try {
+			mDmo.setDate("Date",
+					DateTimeUtil.ParseDate(tvDate.getText().toString()));
+		} catch (ParseException e) {
+			DialogUtil.Alert(BreedLogEditActivity.this, "请选择日期");
+
+		}
+	}
+
+	void setIntValue(String key, EditText et) {
+		if (!StringUtil.IsNullOrEmpty(et.getText().toString())) {
+			mDmo.setInt(key, Integer.parseInt(et.getText().toString()));
+		}
+	}
+
+	private BigDecimal getDecimalValue(EditText view) {
+
+		if (StringUtil.IsNullOrEmpty(view.getText().toString())) {
+			return BigDecimal.ZERO;
+		} else {
+			return new BigDecimal(view.getText().toString());
+		}
+
+	}
+
+	private void applyToUI() {
+		if (mDmo == null) {
+			DialogUtil.Alert(BreedLogEditActivity.this, "当前可编辑的对象为空");
+			finish();
+			return;
+		}
+
+		if (mBillID > 0) {
+			this.setTitle(String.format("%s-养殖日志单No.%s(%s)",
+					getString(R.string.app_name), mBillID,
+					mDmo.getNamedValue("BillState")));
+
+			spinnerAccount.setSelection(listAccount.indexOf(mDmo
+					.getString("AccountingUnit_Name")));
+			spinnerFactory.setSelection(listFactory.indexOf(mDmo
+					.getString("BreedFactory_Name")));
+			spinnerBatch.setSelection(listBatch.indexOf(mDmo
+					.getString("Batch_Name")));
+			spinnerCage.setSelection(listCage.indexOf(mDmo
+					.getString("BreederCage_Name")));
+
+			getIntValue("DeadGong", txtDeadGong);
+			getIntValue("DeadMu", txtDeadMu);
+			getIntValue("TaoTaiGong", txtTaoTaiGong);
+			getIntValue("TaoTaiMu", txtTaoTaiMu);
+			getIntValue("DeadGong", txtDeadGong);
+
+			txtEatTime.setText(mDmo.getString("EatSiLiaoDate"));
+			if (mDmo.getDecimal("DrinkWater") != null) {
+				txtDrinkWater.setText(mDmo.getDecimal("DrinkWater").toString());
+			}
+			tvDate.setText(DateTimeUtil.FormatDate(mDmo.getDate("Date")));
+		}
+
+	}
+
+	void getIntValue(String key, EditText et) {
+		if (mDmo.getInt(key) != null) {
+			et.setText(mDmo.getInt(key).toString());
+		}
+	}
+
+}
diff --git a/src/BWP/MobileSale/BreedLog/BreedLogListActivity.java b/src/BWP/MobileSale/BreedLog/BreedLogListActivity.java
new file mode 100644
index 0000000..497ab30
--- /dev/null
+++ b/src/BWP/MobileSale/BreedLog/BreedLogListActivity.java
@@ -0,0 +1,195 @@
+package BWP.MobileSale.BreedLog;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+import BWP.MobileSale.Order.OrderEditActivity;
+import BWP.MobileSale.Order.OrderListActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.StringUtil;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.SimpleAdapter.ViewBinder;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+public class BreedLogListActivity extends LoginedActivity {
+
+	Button btnReturn;
+	Button btnNew;
+	ListView listView;
+	private SimpleAdapter adapter;
+	private Spinner filter;
+	private Spinner billStateFilter;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.breedlog_list);
+		
+		
+		
+		btnReturn=(Button)findViewById(R.id.breedlog_list_btn_return);
+		btnReturn.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				finish();
+				
+			}
+		});
+		
+		btnNew=(Button)findViewById(R.id.breedlog_list_btn_new);
+		btnNew.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(v, BreedLogEditActivity.class);
+				
+			}
+		});
+		initFilter();
+		
+		initListView();
+		try {
+			RpcObject argument = RpcObject.create("/Hatch/BreedingPoultry/Rpcs/RpcSearch");
+		} catch (JsonRpcException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	private void initFilter() {
+		filter = ActivityUtil.Find(this, R.id.breedlog_list_spinnersearch);
+		billStateFilter = (Spinner) findViewById(R.id.breedlog_list_spinnerbillstate);
+		
+		OnItemSelectedListener listener = new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				StartQuery();
+				
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+				
+			}
+		};
+		
+		filter.setOnItemSelectedListener(listener);
+		billStateFilter.setOnItemSelectedListener(listener);
+		
+	}
+	
+	
+		private void initListView() {
+			listView = ActivityUtil.Find(this, R.id.breedlog_list_listview);
+
+			listView.setOnItemClickListener(new OnItemClickListener() {
+
+				@SuppressWarnings("unchecked")
+				public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+						long arg3) {
+					HashMap<String, Object> map = (HashMap<String, Object>) arg0
+							.getItemAtPosition(arg2);
+					Intent intent = new Intent();
+					intent.putExtra("ID", (Long) map.get("ID"));
+					intent.setClass(arg1.getContext(),BreedLogEditActivity.class);
+					startActivityForResult(intent,BreedLogEditActivity.RequestCode_Open);
+				}
+
+			});
+		}		
+		
+		
+		ViewBinder viewBinder = new ViewBinder() {
+			public boolean setViewValue(View view, Object data,String textRepresentation) {
+				if (view.getId() == R.id.breedlog_list_item_textviewdate) {
+					((TextView)view).setText(DateTimeUtil.FormatDate((Date) data));
+					return true;
+				}
+				else{
+					return false;
+				}
+			}
+		};
+		String[] columnNames = new String[]{"ID","AccountingUnit_Name","Date","BreedFactory_Name","Batch_Name","BreederCage_Name"};
+		
+		int[] columnIDs = new int[]{R.id.breedlog_list_item_textviewid,R.id.breedlog_list_item_textviewaccount,R.id.breedlog_list_item_textviewdate, R.id.breedlog_list_item_textviewfactory,R.id.breedlog_list_item_textviewbatch,R.id.breedlog_list_item_textviewcage};
+		
+		
+		
+		CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+			public Object call() throws Exception {
+				String method = "/Hatch/BreedingPoultry/Rpcs/MobileBreedLogRpc/Search";
+				RpcObject argument = RpcObject.create("/Hatch/BreedingPoultry/Rpcs/RpcSearch");
+				
+				//Resources resource = getResources();
+				String searchkey = (String) filter.getSelectedItem();
+				argument.setString("SearchKey", searchkey);
+			
+				argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());				
+			
+				
+				DFDataTable table = RpcFacade.rpcCall(method, argument);
+				List<RpcObject> rows = table.getRows();		
+			
+				
+				
+				adapter = new SimpleAdapter(BreedLogListActivity.this, rows,R.layout.breedlog_list_item, columnNames,columnIDs);
+				adapter.setViewBinder(viewBinder);
+				return null;
+			}
+
+			@Override
+			protected void successUI() {
+				listView.setAdapter(adapter);
+			}
+
+
+		};
+		
+		
+		
+		@Override
+		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+			// TODO Auto-generated method stub
+			super.onActivityResult(requestCode, resultCode, data);
+			
+			switch(requestCode){
+			case BreedLogEditActivity.RequestCode_Open:
+				StartQuery();
+				break;
+			}
+		}
+
+		private void StartQuery() {
+			searchTask.execute();
+		}
+
+	
+	
+}
diff --git a/src/BWP/MobileSale/ChinaPay/ChinaPayMainActivity.java b/src/BWP/MobileSale/ChinaPay/ChinaPayMainActivity.java
new file mode 100644
index 0000000..52a4332
--- /dev/null
+++ b/src/BWP/MobileSale/ChinaPay/ChinaPayMainActivity.java
@@ -0,0 +1,48 @@
+package BWP.MobileSale.ChinaPay;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+import BWP.MobileSale.Order.OrderEditActivity; 
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class ChinaPayMainActivity extends LoginedActivity {
+ 
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.chianpay_main);
+		
+		Button pay = (Button)findViewById(R.id.Button_Pay);
+		pay.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, PayActivity.class);
+			}
+		});
+
+		
+		Button payset = (Button)findViewById(R.id.Button_PayProfileSet);
+		payset.setOnClickListener(new OnClickListener(){
+
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, SetPayProfileActivity.class);
+			}
+			
+		});
+		
+		
+		Button paylist = (Button)findViewById(R.id.Button_PayList);
+		paylist.setOnClickListener(new OnClickListener(){
+
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, PayListActivity.class);
+			}
+			
+		});		
+	 
+	}
+}
diff --git a/src/BWP/MobileSale/ChinaPay/PayActivity.java b/src/BWP/MobileSale/ChinaPay/PayActivity.java
new file mode 100644
index 0000000..386f0e6
--- /dev/null
+++ b/src/BWP/MobileSale/ChinaPay/PayActivity.java
@@ -0,0 +1,328 @@
+package BWP.MobileSale.ChinaPay;
+
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.NamedValue;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.text.method.DigitsKeyListener;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+import android.widget.TextView;
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DialogUtil;
+
+public class PayActivity extends LoginedActivity {
+	private RpcObject mDmo, mPayDmo;
+	Spinner spAccountUnit, spHeadOffice,spCardNo;
+	TextView UsrName, CertId, moneyInput,feeInput,accMoneyInput ;
+	DFDataTable tablePayInfo;
+	ArrayAdapter<String> adapter1;
+	ArrayAdapter<String> cardNoAdapter;	
+	DFDataTable tableHeadOffice;
+	DFDataTable tableOpenBankId;	
+	DFDataTable tableCertType;
+	List<String> listCardNo = new ArrayList<String>();
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.chinapay_pay);
+		loadTask.execute();
+	}
+
+	CallableTask loadTask = new CallableTask(PayActivity.this, "读取中...") {
+
+		@Override
+		public Object call() throws Exception {
+
+			String method = "/Sale/SaleExportBase/ChinaPayRpc/LoadUserProfile";
+			mDmo = RpcFacade.rpcCall(method);
+
+			mPayDmo = RpcObject
+					.create("/Sale/BWP/SaleExportBase/ChinaPay/PayObj");
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			initControls();
+			/*
+			 * try {
+			 * 
+			 * } catch (JsonRpcException e) { DialogUtil.Alert(PayActivity.this,
+			 * e.getDetailMessage()); e.printStackTrace(); }
+			 */
+		}
+
+	};
+
+	private void initControls() throws JsonRpcException {
+		if (mDmo.getLong("ID") == 0) {
+			DialogUtil.AutoHiddenAlert(PayActivity.this, "请先进行个性设置，完善付款相关信息！");
+			finish();
+			return;
+		}
+ 
+		initAccountUnit();
+		initHeadOffice();
+		initcardNo();
+		initUsrName();
+		initCertId();
+		initmoneyInput();
+		initButton();
+		
+		String method = "/Sale/SaleExportBase/ChinaPayRpc/GetCertType";
+		tableCertType = RpcFacade.rpcCall(method);
+		method = "/Sale/SaleExportBase/ChinaPayRpc/GetBankType";
+		tableOpenBankId = RpcFacade.rpcCall(method);
+		
+		method = "/Sale/SaleExportBase/ChinaPayRpc/GetPayInfo";
+		tablePayInfo = RpcFacade.rpcCall(method, mDmo.getLong("HeadOffice_ID"));
+		listCardNo.clear();
+		List<RpcObject> rows1 = tablePayInfo.getRows();
+		for (RpcObject b : rows1) {
+			listCardNo.add(b.getString("CardNo"));
+		}
+		String card = mDmo.getString("CardNo");
+		if (!listCardNo.contains(card)) {
+			listCardNo.add(0, card);
+		}
+		cardNoAdapter = new ArrayAdapter<String>(PayActivity.this,
+				android.R.layout.simple_spinner_item, listCardNo);
+		spCardNo.setAdapter(cardNoAdapter);
+		spCardNo.setSelection(listCardNo.indexOf(card));
+		spCardNo.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() {
+			public void onItemSelected(AdapterView<?> arg0, View arg1,
+					int arg2, long arg3) {
+				List<RpcObject> rows = tablePayInfo.getRows();
+				Boolean h = false;
+				String cardNo = arg0.getItemAtPosition(arg2).toString();
+				for (RpcObject b : rows) {
+					if (cardNo == b.getString("CardNo")) {
+						UsrName.setText(b.getString("UsrName"));
+						CertId.setText(b.getString("CertId"));
+ 
+						mDmo.setNamedValue("OpenBankId", b.getNamedValue("OpenBankId")); 
+						mDmo.setNamedValue("CertType", b.getNamedValue("CertType"));
+						mDmo.setNamedValue("CardType", b.getNamedValue("CardType"));  
+						h = true;
+						break;
+					}
+				}
+				if (!h) {
+					UsrName.setText("");
+					CertId.setText(""); 
+				}
+			}
+
+			public void onNothingSelected(AdapterView<?> arg0) {
+			}
+		});
+	}
+
+	private void initAccountUnit() throws JsonRpcException {
+		spAccountUnit = (Spinner) findViewById(R.id.order_setuser_setaccountunit);
+		List<String> list = new ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadAccountingUnit";
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+				PayActivity.this, android.R.layout.simple_spinner_item, list);
+		spAccountUnit.setAdapter(adapter);
+		spAccountUnit.setSelection(list.indexOf(mDmo
+				.getString("AccountingUnit_Name")));
+
+	}
+
+	private void initHeadOffice() throws JsonRpcException {
+		spHeadOffice = (Spinner) findViewById(R.id.order_setuser_sethheadoffice);
+		List<String> list = new ArrayList<String>();
+		list.add("");
+		String method = "/Sale/SaleExportBase/ChinaPayRpc/LoadHeadOffice";
+		tableHeadOffice = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = tableHeadOffice.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}
+		adapter1 = new ArrayAdapter<String>(PayActivity.this,
+				android.R.layout.simple_spinner_item, list);
+		spHeadOffice.setAdapter(adapter1);
+		spHeadOffice.setSelection(list.indexOf(mDmo
+				.getString("HeadOffice_Name")));
+
+		spHeadOffice
+		.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() {
+			public void onItemSelected(AdapterView<?> arg0, View arg1,
+					int arg2, long arg3) {
+				List<RpcObject> rows = tableHeadOffice.getRows();
+				Long id = 0L;
+				for (RpcObject b : rows) {
+					if (adapter1.getItem(arg2) == b.getString("Name")) {
+						id = b.getLong("ID");
+						break;
+					}
+				}
+				String method = "/Sale/SaleExportBase/ChinaPayRpc/GetPayInfo";
+				tablePayInfo = RpcFacade.rpcCall(method, id);
+				List<RpcObject> rows1 = tablePayInfo.getRows();
+				listCardNo.clear();
+				listCardNo.add("");
+				for (RpcObject b : rows1) {
+					listCardNo.add(b.getString("CardNo"));
+				}
+				ArrayAdapter<String> cardNoAdapter = new ArrayAdapter<String>(PayActivity.this,
+						android.R.layout.simple_spinner_item, listCardNo);
+				spCardNo.setAdapter(cardNoAdapter);
+				String card = mDmo.getString("CardNo");
+				if (listCardNo.contains(card)) {
+					spCardNo.setSelection(listCardNo.indexOf(card)); 
+				} 
+			}
+
+			public void onNothingSelected(AdapterView<?> arg0) {
+			}
+		});
+		
+		
+	}
+
+	private void initcardNo() {
+		spCardNo = (Spinner) findViewById(R.id.order_setuser_setCarNo); 
+	}
+
+	private void initUsrName() {
+		UsrName = ActivityUtil.Find(this, R.id.order_setuser_setPayUserName);
+		UsrName.setText(mDmo.getString("UsrName"));
+	}
+
+	private void initCertId() {
+		CertId = ActivityUtil.Find(this, R.id.order_setuser_setCerID);
+		CertId.setText(mDmo.getString("CertId"));
+	}
+
+	private void initmoneyInput() {		
+		feeInput = ActivityUtil.Find(this, R.id.chinapay_fee);
+		feeInput.setText(String.valueOf(mDmo.getDecimal("Fee")));
+		accMoneyInput = ActivityUtil.Find(this, R.id.chinapay_accmoney);
+		moneyInput = ActivityUtil.Find(this, R.id.chinapay_money);
+		moneyInput.setKeyListener(new DigitsKeyListener(false, true));
+
+		moneyInput.addTextChangedListener(new TextWatcher() {
+
+			@Override
+			public void afterTextChanged(Editable s) {
+		
+			}
+
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count,
+					int after) {
+			}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before,
+					int count) {
+				try{
+					Double fee = Double.parseDouble(feeInput.getText().toString());
+					Double money = Double.parseDouble(moneyInput.getText() .toString());
+					 NumberFormat nbf=NumberFormat.getInstance();   
+					 nbf.setMinimumFractionDigits(2);
+					accMoneyInput.setText(nbf.format( money - fee) ) ;	
+				}catch(Exception e){} 
+				
+			}
+		});
+
+	}
+
+	private void initButton() {
+		Button btnReturn = (Button) findViewById(R.id.Order_SetUser_Ruturn);
+		btnReturn.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+
+		Button pay = (Button) findViewById(R.id.ChinaPay_DoPay);
+		pay.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				saveTask.execute();
+
+			}
+		});
+	}
+
+	RpcObject result;
+
+	CallableTask saveTask = new CallableTask(PayActivity.this, "付款中...") {
+		@Override
+		public Object call() throws Exception {
+
+			// UpdateUserProfile
+			String acc = (String) spAccountUnit.getSelectedItem();
+			String ho = (String) spHeadOffice.getSelectedItem();
+
+			mDmo.setString("AccountingUnit_Name", acc);
+			mDmo.setString("HeadOffice_Name", ho);
+			mDmo.setString("CardNo", (String)spCardNo.getSelectedItem());
+			mDmo.setString("UsrName", UsrName.getText().toString());
+			mDmo.setString("CertId", CertId.getText().toString());
+		 
+ 
+			mPayDmo.setString("AccountingUnit_Name", acc);
+			mPayDmo.setString("HeadOffice_Name", ho);
+			mPayDmo.setString("CardNo", (String)spCardNo.getSelectedItem());
+			mPayDmo.setString("UsrName", UsrName.getText().toString());
+			mPayDmo.setString("CertId", CertId.getText().toString()); 
+			mPayDmo.setString("TransAmt", moneyInput.getText().toString()); 
+			mPayDmo.setNamedValue("OpenBankIdNv", mDmo.getNamedValue("OpenBankId"));
+			mPayDmo.setNamedValue("CardTypeNv", mDmo.getNamedValue("CardType"));
+			mPayDmo.setNamedValue("CertTypeNv", mDmo.getNamedValue("CertType"));
+
+			String method = "/Sale/SaleExportBase/ChinaPayRpc/DoPay";
+			result = RpcFacade.rpcCall(method, mPayDmo);
+
+			method = "/Sale/SaleExportBase/ChinaPayRpc/UpdateUserProfile";
+			RpcFacade.rpcCall(method, mDmo);
+
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			if (result.getBoolean("Success")) {
+				DialogUtil.AutoHiddenAlert(PayActivity.this, "付款成功");
+				finish();
+			} else {
+				DialogUtil.Alert(PayActivity.this,
+						"付款失败" + result.getString("Msg"));
+			}
+
+		}
+
+	};
+
+}
diff --git a/src/BWP/MobileSale/ChinaPay/PayListActivity.java b/src/BWP/MobileSale/ChinaPay/PayListActivity.java
new file mode 100644
index 0000000..47ce1db
--- /dev/null
+++ b/src/BWP/MobileSale/ChinaPay/PayListActivity.java
@@ -0,0 +1,286 @@
+package BWP.MobileSale.ChinaPay;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.SimpleAdapter.ViewBinder;
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.DialogUtil.SetDate;
+
+public class PayListActivity extends LoginedActivity {
+	boolean flag = false;
+	int pageCount = 0;
+	private Button buttonMinDate;
+	private Button buttonMaxDate;
+	int pageIndex = 1;
+	ListView listView;
+	private SimpleAdapter adapter;
+	SumInfo mSumInfo = new SumInfo();
+
+	String[] columnNames = new String[] {"Money","Money2", "TransDate","IsSuccess", "HeadOffice_Name",
+			  "Message" };
+
+	int[] columnIDs = new int[] { R.id.TextView1,R.id.TextView6, R.id.TextView2,
+			R.id.TextView3, R.id.TextView_4, R.id.TextView_5 };
+
+	class SumInfo {
+		public int RowCount;
+		public BigDecimal Money;
+
+		@Override
+		public String toString() {
+			return String.format("共%s元", Money);
+		}
+
+	}
+
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+		super.onActivityResult(requestCode, resultCode, data);
+
+		StartQuery(false);
+
+	}
+
+	private void StartQuery(boolean flag2) {
+
+		searchTask.execute();
+	}
+
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/SaleExportBase/ChinaPayRpc/Search";
+
+			if (flag == false) {
+				pageCount = GetPageCount();
+			}
+
+			RpcObject argument = SetArgument();
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			mSumInfo.Money = new BigDecimal(0);
+			for (RpcObject row : rows) {
+				mSumInfo.Money = mSumInfo.Money.add(row.getMoney("Money"));
+			}
+			adapter = new SimpleAdapter(PayListActivity.this, rows,
+					R.layout.chinapay_list_item, columnNames, columnIDs);
+			adapter.setViewBinder(viewBinder);
+			return null;
+
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+
+	};
+
+	ViewBinder viewBinder = new ViewBinder() {
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.TextView2) {
+				((TextView) view).setText(DateTimeUtil.FormatDate((Date) data));
+				return true;
+			}else if (view.getId() == R.id.TextView3) {
+				String cg = "失败";
+				if ((Boolean) data)
+					cg = "成功";
+				((TextView) view).setText(cg);
+				return true;
+			} else {
+				return false;
+			}
+		}
+	};
+
+	private int GetPageCount() {
+		String method = "/Sale/SaleExportBase/ChinaPayRpc/GetPageNum";
+		try {
+			RpcObject argument = SetArgument();
+			return RpcFacade.rpcCall(method, argument);
+		} catch (Exception e) {
+
+		}
+		return 0;
+	}
+
+	private RpcObject SetArgument() throws ParseException {
+		RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+		argument.setString("SearchKey2", (String)suc.getSelectedItem());
+		String dateText = buttonMinDate.getText().toString();
+		String dateText2 = buttonMaxDate.getText().toString();
+		if (!StringUtil.IsNullOrEmpty(dateText)) {
+			Date parseDate = (Date) DateTimeUtil.ParseDate(dateText);
+			argument.setDate("Date1", parseDate);
+		}
+		if (!StringUtil.IsNullOrEmpty(dateText2)) {
+			Date parseEndDate = (Date) DateTimeUtil.ParseDate(dateText2);
+			argument.setDate("Date2", parseEndDate);
+		}
+		argument.setInt("PageIndex", pageIndex);
+		return argument;
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "刷新");
+		menu.add(0, 2, 1, "统计");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Menu.FIRST:
+			StartQuery(false);
+			break;
+		case 2:
+			DialogUtil.Alert(this, mSumInfo.toString());
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.chinapay_list);
+
+		initButtonReturn();
+		initFilter();
+		initListView();
+
+		initButtonDate();
+		initButtonNextPage();
+		initButtonUpPage();
+		StartQuery(false);
+
+	}
+
+	private void initButtonReturn() {
+		ActivityUtil.FindButton(this, R.id.Button_Return)
+
+		.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View v) {
+				finish();
+			}
+		});
+	}
+
+	private void initButtonNextPage() {
+		ActivityUtil.FindButton(this, R.id.Button_NextPage).setOnClickListener(
+				new OnClickListener() {
+					public void onClick(View v) {
+						pageIndex++;
+						if (pageIndex >= pageCount) {
+							return;
+						}
+						StartQuery(true);
+					}
+				});
+	}
+
+	private void initButtonUpPage() {
+		ActivityUtil.FindButton(this, R.id.Button_UpPage).setOnClickListener(
+				new OnClickListener() {
+					public void onClick(View v) {
+
+						pageIndex--;
+						if (pageIndex <= 0) {
+							return;
+						}
+						StartQuery(true);
+					}
+				});
+	}
+
+	private void initListView() {
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+			}
+
+		});
+	}
+
+	private void initButtonDate() {
+		buttonMinDate = ActivityUtil.FindButton(this, R.id.Button_Date);
+		DialogUtil.AddSelectDateDialog(buttonMinDate, new SetDate() {
+
+			@Override
+			public void setDate(java.util.Date date) {
+				pageIndex = 1;
+				StartQuery(false);
+			}
+
+		});
+		buttonMaxDate = ActivityUtil.FindButton(this, R.id.Button_EndDate);
+		DialogUtil.AddSelectDateDialog(buttonMaxDate, new SetDate() {
+
+			@Override
+			public void setDate(java.util.Date date) {
+				pageIndex = 1;
+				StartQuery(false);
+			}
+
+		});
+	}
+
+	Spinner suc;
+	private void initFilter() {
+		suc = (Spinner) findViewById(R.id.Spinner_suc);
+		 
+		OnItemSelectedListener listener = new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				pageIndex = 1;
+				StartQuery(false);
+				
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+				
+			}
+		};
+		
+		suc.setOnItemSelectedListener(listener); 
+		
+	}
+
+}
diff --git a/src/BWP/MobileSale/ChinaPay/SetPayProfileActivity.java b/src/BWP/MobileSale/ChinaPay/SetPayProfileActivity.java
new file mode 100644
index 0000000..ef13b25
--- /dev/null
+++ b/src/BWP/MobileSale/ChinaPay/SetPayProfileActivity.java
@@ -0,0 +1,316 @@
+package BWP.MobileSale.ChinaPay;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.NamedValue;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DialogUtil;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+public class SetPayProfileActivity extends LoginedActivity {
+
+	Spinner spAccountUnit, spHeadOffice, spCardNo;
+	TextView UsrName, CertId, OpenBankId, CardType, CertType;
+	List<String> listCardNo = new ArrayList<String>();
+	private RpcObject mDmo;
+
+	ArrayAdapter<String> adapter1;
+	//ArrayAdapter<String> cardNoAdapter;
+	DFDataTable tableHeadOffice;
+	DFDataTable tableOpenBankId;	
+	DFDataTable tableCertType;
+	DFDataTable tablePayInfo;
+
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.chinapay_setuserprofile);
+		loadTask.execute();
+	}
+
+	CallableTask loadTask = new CallableTask(SetPayProfileActivity.this,
+			"读取中...") {
+
+		@Override
+		public Object call() throws Exception {
+
+			String method = "/Sale/SaleExportBase/ChinaPayRpc/LoadUserProfile";
+			mDmo = RpcFacade.rpcCall(method);
+			if (mDmo == null) {
+				mDmo = RpcObject
+						.create("/Sale/SaleExportBase/BO/ChinaPayProfile");
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			try {
+				initControls();
+			} catch (JsonRpcException e) {
+				DialogUtil.Alert(SetPayProfileActivity.this,
+						e.getDetailMessage());
+				e.printStackTrace();
+			}
+		}
+
+	};
+
+	private void initControls() throws JsonRpcException {
+		initAccountUnit();
+		initOpenBankId();
+		initcardNo();
+		initUsrName();
+		initCertId();
+		initCardType();
+		initCertType();
+		initButton();
+		initHeadOffice();
+		
+		String method = "/Sale/SaleExportBase/ChinaPayRpc/GetCertType";
+		tableCertType = RpcFacade.rpcCall(method);
+		
+		method = "/Sale/SaleExportBase/ChinaPayRpc/GetBankType";
+		tableOpenBankId = RpcFacade.rpcCall(method); 
+		
+		method = "/Sale/SaleExportBase/ChinaPayRpc/GetPayInfo";
+		tablePayInfo = RpcFacade.rpcCall(method, mDmo.getLong("HeadOffice_ID"));
+		
+		listCardNo.clear();
+		List<RpcObject> rows1 = tablePayInfo.getRows();
+		for (RpcObject b : rows1) {
+			listCardNo.add(b.getString("CardNo"));
+		}
+		String card = mDmo.getString("CardNo");
+		if (!listCardNo.contains(card)) {
+			listCardNo.add(0, card);
+		}
+		ArrayAdapter<String> cardNoAdapter = new ArrayAdapter<String>(SetPayProfileActivity.this,
+				android.R.layout.simple_spinner_item, listCardNo);
+		spCardNo.setAdapter(cardNoAdapter);
+		spCardNo.setSelection(listCardNo.indexOf(card));
+		spCardNo.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() {
+			public void onItemSelected(AdapterView<?> arg0, View arg1,
+					int arg2, long arg3) {
+				List<RpcObject> rows = tablePayInfo.getRows();
+				Boolean h = false;
+				String cardNo = arg0.getItemAtPosition(arg2).toString();   //cardNoAdapter.getItem(arg2);
+				for (RpcObject b : rows) {
+					if ( cardNo== b.getString("CardNo")) {
+						UsrName.setText(b.getString("UsrName"));
+						CertId.setText(b.getString("CertId"));
+
+						NamedValue bankId = b.getNamedValue("OpenBankId");
+						if (bankId != null) {
+							OpenBankId.setText(bankId.getName());
+						} else {
+							OpenBankId.setText("");
+						}
+						NamedValue ctype = b.getNamedValue("CertType");
+						if (ctype != null) {
+							CertType.setText(ctype.getName());
+						} else {
+							CertType.setText("");
+						}
+						if (b.getNamedValue("CardType") != null) {
+							CardType.setText(b.getNamedValue("CardType")
+									.getName());
+						} else {
+							CardType.setText("");
+						}
+						mDmo.setNamedValue("OpenBankId", b.getNamedValue("OpenBankId")); 
+						mDmo.setNamedValue("CertType", b.getNamedValue("CertType"));
+						mDmo.setNamedValue("CardType", b.getNamedValue("CardType"));
+						h = true;
+						break;
+					}
+				}
+				if (!h) {
+					UsrName.setText("");
+					CertId.setText("");
+					OpenBankId.setText("");
+					CertType.setText("");
+					CardType.setText("");
+				}
+			}
+
+			public void onNothingSelected(AdapterView<?> arg0) {
+			}
+		});
+	}
+
+	private void initCardType() throws JsonRpcException {
+		CardType = ActivityUtil.Find(this, R.id.order_setuser_setCardType);
+		if (mDmo.getNamedValue("CardType") != null) {
+			CardType.setText(mDmo.getNamedValue("CardType").getName());
+		}
+	}
+
+	private void initCertType() throws JsonRpcException {
+		CertType = ActivityUtil.Find(this, R.id.order_setuser_setCerType);
+
+		NamedValue ctype = mDmo.getNamedValue("CertType");
+		if (ctype != null) {
+			CertType.setText(ctype.getName());
+		}
+	}
+
+	private void initButton() {
+		Button btnReturn = (Button) findViewById(R.id.Order_SetUser_Ruturn);
+		btnReturn.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+
+		Button btnSave = (Button) findViewById(R.id.Order_SetUser_Save);
+		btnSave.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				saveTask.execute();
+
+			}
+		});
+	}
+
+	CallableTask saveTask = new CallableTask(SetPayProfileActivity.this,
+			"保存中...") {
+		@Override
+		public Object call() throws Exception {
+ 
+			mDmo.setString("AccountingUnit_Name",
+					(String) spAccountUnit.getSelectedItem());
+			mDmo.setString("HeadOffice_Name",
+					(String) spHeadOffice.getSelectedItem());
+ 
+			mDmo.setString("CardNo", (String) spCardNo.getSelectedItem());
+			mDmo.setString("UsrName", UsrName.getText().toString());
+			mDmo.setString("CertId", CertId.getText().toString());
+			String method = "/Sale/SaleExportBase/ChinaPayRpc/UpdateUserProfile";
+
+			RpcFacade.rpcCall(method, mDmo);
+
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(SetPayProfileActivity.this, "保存成功");
+			finish();
+		}
+
+	};
+
+	private void initAccountUnit() throws JsonRpcException {
+		spAccountUnit = (Spinner) findViewById(R.id.order_setuser_setaccountunit);
+		List<String> list = new ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadAccountingUnit";
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+				SetPayProfileActivity.this,
+				android.R.layout.simple_spinner_item, list);
+		spAccountUnit.setAdapter(adapter);
+		spAccountUnit.setSelection(list.indexOf(mDmo
+				.getString("AccountingUnit_Name")));
+
+	}
+
+	private void initHeadOffice() throws JsonRpcException {
+		spHeadOffice = (Spinner) findViewById(R.id.order_setuser_sethheadoffice);
+		List<String> list = new ArrayList<String>();
+		list.add("");
+		String method = "/Sale/SaleExportBase/ChinaPayRpc/LoadHeadOffice";
+		tableHeadOffice = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = tableHeadOffice.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}
+		adapter1 = new ArrayAdapter<String>(SetPayProfileActivity.this,
+				android.R.layout.simple_spinner_item, list);
+		spHeadOffice.setAdapter(adapter1);
+		spHeadOffice.setSelection(list.indexOf(mDmo
+				.getString("HeadOffice_Name")));
+
+		spHeadOffice
+				.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() {
+					public void onItemSelected(AdapterView<?> arg0, View arg1,
+							int arg2, long arg3) {
+						List<RpcObject> rows = tableHeadOffice.getRows();
+						Long id = 0L;
+						for (RpcObject b : rows) {
+							if (adapter1.getItem(arg2) == b.getString("Name")) {
+								id = b.getLong("ID");
+								break;
+							}
+						}
+						String method = "/Sale/SaleExportBase/ChinaPayRpc/GetPayInfo";
+						tablePayInfo = RpcFacade.rpcCall(method, id);
+						List<RpcObject> rows1 = tablePayInfo.getRows();
+						listCardNo.clear();
+						listCardNo.add("");
+						for (RpcObject b : rows1) {
+							listCardNo.add(b.getString("CardNo"));
+						}
+						ArrayAdapter<String> cardNoAdapter = new ArrayAdapter<String>(SetPayProfileActivity.this,
+								android.R.layout.simple_spinner_item, listCardNo);
+						spCardNo.setAdapter(cardNoAdapter);
+						String card = mDmo.getString("CardNo");
+						if (listCardNo.contains(card)) {
+							spCardNo.setSelection(listCardNo.indexOf(card)); 
+						} 
+					}
+
+					public void onNothingSelected(AdapterView<?> arg0) {
+					}
+				});
+
+	}
+
+	private void initOpenBankId() throws JsonRpcException {
+		OpenBankId = ActivityUtil.Find(this, R.id.order_setuser_setBankID);
+
+		NamedValue bankId = mDmo.getNamedValue("OpenBankId");
+		if (bankId != null) {
+			OpenBankId.setText(bankId.getName());
+		}
+	}
+
+	private void initcardNo() throws JsonRpcException {
+		spCardNo = (Spinner) findViewById(R.id.order_setuser_setCarNo); 
+	}
+
+	private void initUsrName() throws JsonRpcException {
+		UsrName = ActivityUtil.Find(this, R.id.order_setuser_setPayUserName);
+		UsrName.setText(mDmo.getString("UsrName"));
+	}
+
+	private void initCertId() throws JsonRpcException {
+		CertId = ActivityUtil.Find(this, R.id.order_setuser_setCerID);
+		CertId.setText(mDmo.getString("CertId"));
+	}
+}
diff --git a/src/BWP/MobileSale/ClientUpdateActivity.java b/src/BWP/MobileSale/ClientUpdateActivity.java
new file mode 100644
index 0000000..17d9ac8
--- /dev/null
+++ b/src/BWP/MobileSale/ClientUpdateActivity.java
@@ -0,0 +1,224 @@
+package BWP.MobileSale;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.forks.jsonrpc.RpcFacade;
+
+import BWP.MobileSale.Util.ConfigUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class ClientUpdateActivity extends Activity{
+	final String tag = "ClientUpdateActivity";
+
+	private int fileSize;
+	private int downLoadFileSize;
+
+	private ProgressBar progressBar;
+	private TextView textViewProgress;
+	String fullpathfilename;
+	private Button installButton;
+	boolean secceed=true;
+	private class DownLoadTask extends AsyncTask<Void, Integer, Void> {
+
+		@Override
+		protected Void doInBackground(Void... params) {
+			try {
+				
+				down_file();
+			} catch (Exception ex) {
+				secceed=false;
+				Log.d(tag, "错误"+ex.getMessage());				
+				System.out.println("错误"+ex.getMessage());
+				this.cancel(true);
+			}
+			return null;
+		}
+
+		public void down_file() throws Exception {
+
+			String serverUri = ConfigUtil
+					.getServerUri(ClientUpdateActivity.this);
+			Log.i(tag, String.format("get server uri:%s", serverUri));
+
+			String method = "/Sale/Sale/Rpcs/MobileSaleClientRpc/GetAndroidClientUrl";
+			
+			String url = RpcFacade.rpcCall(method);
+			int subStrStart = url.indexOf("/", 1);
+			if (serverUri.endsWith("/")) {
+				subStrStart++;
+			}
+			url = serverUri + url.substring(subStrStart);
+			Log.d(tag, "start download " + url);
+
+			String saveFolder = Environment.getExternalStorageDirectory()
+					.getAbsolutePath();
+			fullpathfilename = saveFolder + File.separator + "MobileSale.apk";
+
+			Log.d("MobileSale", String.format("save %s to %s", url, fullpathfilename));
+			
+			URL myURL = new URL(url);
+			URLConnection conn = myURL.openConnection();
+			conn.connect();
+			InputStream inputStream = conn.getInputStream();
+			fileSize = conn.getContentLength();// 根据响应获取文件大小
+			if (fileSize <= 0)
+				throw new Exception("无法获知文件大小 ");
+			if (inputStream == null)
+				throw new Exception("stream is null");
+			publishProgress(fileSize);
+			FileOutputStream outputStream = new FileOutputStream(fullpathfilename);
+			// 把数据存入路径+文件名
+			byte buf[] = new byte[1024];
+			downLoadFileSize = 0;
+			do {
+				// 循环读取
+				int numread = inputStream.read(buf);
+				if (numread == -1) {
+					break;
+				}
+				outputStream.write(buf, 0, numread);
+				downLoadFileSize += numread;
+
+				publishProgress();
+			} while (true);
+			inputStream.close();
+		}
+
+		@Override
+		protected void onProgressUpdate(Integer... values) {
+
+			if (values.length > 0) {
+				progressBar.setMax(values[0]);
+			} else {
+				progressBar.setProgress(downLoadFileSize);
+				int result = downLoadFileSize * 100 / fileSize;
+				textViewProgress.setText(result + "%");
+			}
+			super.onProgressUpdate(values);
+		}
+
+		@Override
+		protected void onPostExecute(Void result) {
+
+			if(secceed)
+			{
+				Toast.makeText(ClientUpdateActivity.this, "文件下载完成", 1).show();
+				deleteSaleOrderApk();
+				installButton.setVisibility(View.VISIBLE);
+			}
+			else
+			{
+				Toast.makeText(ClientUpdateActivity.this, "文件下载错误", 1).show();
+			}
+			
+			super.onPostExecute(result);
+		}
+
+		@Override
+		protected void onPreExecute() {
+			progressBar.setMax(fileSize);
+			super.onPreExecute();
+		}
+
+	}
+	
+	private void deleteSaleOrderApk()
+	{
+		try {			
+			
+			if(checkApkExist("BWP.Sale"))
+			{
+				DialogUtil.Confirm(this, "青花瓷手机订单系统已停用，请卸载后安装新版本", "卸载", "取消", new DialogInterface.OnClickListener() {
+					
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						Uri packageURI = Uri.parse("package:BWP.Sale");  
+						
+						Intent uninstallIntent = new Intent(Intent.ACTION_DELETE, packageURI);  
+						
+						startActivity(uninstallIntent);
+					}
+
+					
+				});
+				
+			}
+			
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+		}
+	}
+	
+	public boolean checkApkExist(String packageName) {
+        if (packageName == null || "".equals(packageName))
+                return false;
+        try {
+                ApplicationInfo info = getPackageManager().getApplicationInfo(packageName,PackageManager.GET_UNINSTALLED_PACKAGES);
+                return true;
+        } catch (NameNotFoundException e) {
+                return false;
+        }
+}
+
+
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		setContentView(R.layout.client_update);
+		
+		Button returnButton = (Button)findViewById(R.id.Button_Return);
+		returnButton.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View v) {
+				finish();
+				
+			}
+		});
+		
+		progressBar = (ProgressBar)findViewById(R.id.ProgressBar);
+		textViewProgress = (TextView)findViewById(R.id.TextView_Progress);
+
+		installButton =(Button)findViewById(R.id.Button_OK);
+		installButton.setVisibility(View.GONE);
+		installButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View v) {
+				Intent intent = new Intent(Intent.ACTION_VIEW);
+				intent.setDataAndType(Uri.fromFile(new File(fullpathfilename)),
+						"application/vnd.android.package-archive");
+				startActivity(intent);
+			}
+
+		});
+
+		DownLoadTask downLoadTask = new DownLoadTask();
+		downLoadTask.execute();
+
+	}
+}
diff --git a/src/BWP/MobileSale/CommandService.java b/src/BWP/MobileSale/CommandService.java
new file mode 100644
index 0000000..c66a9a3
--- /dev/null
+++ b/src/BWP/MobileSale/CommandService.java
@@ -0,0 +1,69 @@
+package BWP.MobileSale;
+
+import java.util.LinkedList;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.IBinder;
+
+
+public class CommandService extends Service {
+
+	public static void AddCommand(Command command){
+		synchronized (mCommands) {
+			mCommands.add(command);
+		}
+	}
+	
+	public interface Command{
+		void Execute() throws Exception;
+		String getName();
+	}
+	
+	
+	static LinkedList<Command> mCommands = new LinkedList<Command>();
+	
+	
+	@Override
+	public IBinder onBind(Intent intent) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	class BackgroundTask extends  AsyncTask<Void, Void, Void>{
+		@Override
+		protected Void doInBackground(Void... params) {
+			while(true){
+				Command command;
+				synchronized(mCommands){
+					command = mCommands.poll();
+				}
+				if(command ==null ){
+					try {
+						Thread.sleep(100);
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+					}
+					continue;
+				}
+				try {
+					command.Execute();
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				
+			}
+		}
+		
+	}
+	
+	
+	@Override
+	public void onCreate() {
+		// TODO Auto-generated method stub
+		super.onCreate();
+		new BackgroundTask().execute();
+	}
+}
diff --git a/src/BWP/MobileSale/Config/ConfigBase.java b/src/BWP/MobileSale/Config/ConfigBase.java
new file mode 100644
index 0000000..df5d46e
--- /dev/null
+++ b/src/BWP/MobileSale/Config/ConfigBase.java
@@ -0,0 +1,29 @@
+package BWP.MobileSale.Config;
+
+import BWP.MobileSale.Util.StringUtil;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.preference.PreferenceManager;
+
+public abstract class ConfigBase {
+	String mName;
+	Context mContext;
+	public ConfigBase(Context context,String name){
+		mName = name;
+		mContext = context;
+	}
+	
+	public SharedPreferences getStore(){
+		if(StringUtil.IsNullOrEmpty(mName)){
+			return PreferenceManager.getDefaultSharedPreferences(mContext);
+		}else{
+			return mContext.getSharedPreferences(mName, Context.MODE_PRIVATE);
+		}
+	}
+	
+	public abstract void GetValues(SharedPreferences store);
+	
+	public abstract void SetValues(Editor store);
+
+}
diff --git a/src/BWP/MobileSale/Config/LastLoginInfo.java b/src/BWP/MobileSale/Config/LastLoginInfo.java
new file mode 100644
index 0000000..8c3cc79
--- /dev/null
+++ b/src/BWP/MobileSale/Config/LastLoginInfo.java
@@ -0,0 +1,32 @@
+package BWP.MobileSale.Config;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+public class LastLoginInfo extends ConfigBase {
+
+	public LastLoginInfo(Context context) {
+		super(context, "LastLoginUserInfo");
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void GetValues(SharedPreferences store) {
+		Username = store.getString("Username", "");
+		Password = store.getString("Password", "");
+		CurrentTimeMillis = store.getLong("CurrentTimeMillis", 0);
+	}
+
+	@Override
+	public void SetValues(Editor store) {
+		store.putString("Username", Username);
+		store.putString("Password", Password);
+		store.putLong("CurrentTimeMillis", System.currentTimeMillis());
+	}
+	
+	public String Username;
+	public String Password;
+	public long CurrentTimeMillis;
+
+}
diff --git a/src/BWP/MobileSale/Config/LoginUserConfig.java b/src/BWP/MobileSale/Config/LoginUserConfig.java
new file mode 100644
index 0000000..3264fd5
--- /dev/null
+++ b/src/BWP/MobileSale/Config/LoginUserConfig.java
@@ -0,0 +1,36 @@
+package BWP.MobileSale.Config;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+public class LoginUserConfig extends ConfigBase {
+
+	public LoginUserConfig(Context context) {
+		super(context, "BWP.Sale.LoginUserConfig");
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public
+	void GetValues(SharedPreferences store) {
+		Username = store.getString("Username", "");
+		Password = store.getString("Password", "");
+		SavePassword = store.getBoolean("SavePassword", false);
+	}
+
+	@Override
+	public
+	void SetValues(Editor store) {
+		store.putString("Username", Username);
+		store.putString("Password", Password);
+		store.putBoolean("SavePassword",SavePassword);
+
+	}
+	
+	public String Username;
+	public String Password;
+	public Boolean SavePassword;
+	
+
+}
diff --git a/src/BWP/MobileSale/Config/SaleDataBase.java b/src/BWP/MobileSale/Config/SaleDataBase.java
new file mode 100644
index 0000000..326eb11
--- /dev/null
+++ b/src/BWP/MobileSale/Config/SaleDataBase.java
@@ -0,0 +1,42 @@
+package BWP.MobileSale.Config;
+
+import BWP.MobileSale.R;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteDatabase.CursorFactory;
+
+public class SaleDataBase extends SQLiteOpenHelper {
+	
+	public static SQLiteDatabase getWritableDatabase(Context context){
+		return new SaleDataBase(context, "main", null, CurDbVersion).getWritableDatabase();
+	}
+	
+	public static SQLiteDatabase getReadableDatabase(Context context){
+		return new SaleDataBase(context, "main", null, CurDbVersion).getReadableDatabase();
+	}
+	
+	public static int CurDbVersion = 1;
+	Context mContext;
+
+
+	public SaleDataBase(Context context, String name, CursorFactory factory,
+			int version) {
+		super(context, name, factory, version);
+		mContext = context;
+	}
+
+	@Override
+	public void onCreate(SQLiteDatabase arg0) {
+		arg0.execSQL(mContext.getString(R.string.createTable_ClientGoods));
+		
+		arg0.execSQL(mContext.getString(R.string.createTable_ClientBuyer));
+	}
+
+	@Override
+	public void onUpgrade(SQLiteDatabase arg0, int arg1, int arg2) {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/src/BWP/MobileSale/Config/ServerConfig.java b/src/BWP/MobileSale/Config/ServerConfig.java
new file mode 100644
index 0000000..5bffef6
--- /dev/null
+++ b/src/BWP/MobileSale/Config/ServerConfig.java
@@ -0,0 +1,37 @@
+package BWP.MobileSale.Config;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+public class ServerConfig extends ConfigBase {
+
+	public ServerConfig(Context context) {
+		super(context, "");
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public
+	void GetValues(SharedPreferences store) {
+		mServerUri = store.getString("ServerUri", "");
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public
+	void SetValues(Editor store) {
+		store.putString("ServerUri", getServerUri());
+		// TODO Auto-generated method stub
+
+	}
+
+	private String mServerUri;
+	public String getServerUri(){
+		return mServerUri;
+	}
+	public void setServerUri(String value){
+		mServerUri  = value;
+	}
+}
diff --git a/src/BWP/MobileSale/LoginActivity.java b/src/BWP/MobileSale/LoginActivity.java
new file mode 100644
index 0000000..3fe065d
--- /dev/null
+++ b/src/BWP/MobileSale/LoginActivity.java
@@ -0,0 +1,205 @@
+package BWP.MobileSale;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.ManyList;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Config.LoginUserConfig;
+import BWP.MobileSale.MobileAdjustGoodsBill.MobileAdjustGoodsBillMainActivity;
+import BWP.MobileSale.Util.ConfigUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.StrictMode;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+@SuppressLint("NewApi")
+public class LoginActivity extends Activity {
+
+	private EditText usernameInput;
+	private EditText passwordInput;
+	private CheckBox autoSaveInput;
+	private LoginUserConfig config = new LoginUserConfig(this);
+
+	ViewOnClickTask loginTask = new ViewOnClickTask(this, "登录中...") {
+
+		public Object call() throws Exception {
+			String username = usernameInput.getText().toString();
+			String password = passwordInput.getText().toString();
+			config.Username = username;
+			config.Password = password;
+			config.SavePassword = autoSaveInput.isChecked();
+			if (!config.SavePassword) {
+				config.Password = "";
+			}
+			ConfigUtil.Save(config);
+			RpcFacade.login(username, password);			
+			// 放到每一个子模块中了
+			// String method =
+			// "/Sale/Sale/Rpcs/MobileReturnClientRpc/FeatureEnable";
+			// JsonRpcResult result = RpcFacade.rpcCall(method);
+			// featurEnable = result.getBoolean();
+			// if (!featurEnable) {
+			// RpcFacade.logout();
+			// }
+
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+
+			SaleApplication.SaveLogin(config.Username, config.Password);
+			Utils.ActivityUtil.Go(LoginActivity.this, MainActivity.class);
+
+		}
+
+	};
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		
+    	String strVer=android.os.Build.VERSION.RELEASE;
+    	strVer=strVer.substring(0,3).trim();
+    	float fv=Float.valueOf(strVer);
+    	if(fv>2.3)
+    	{
+    		
+    		StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().detectDiskReads().detectDiskWrites().detectNetwork().penaltyLog().build());
+    		StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectLeakedSqlLiteObjects().detectLeakedSqlLiteObjects().penaltyLog().penaltyDeath().build());
+       	}
+		
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_login);
+		usernameInput = (EditText) findViewById(R.id.EditText_Username);
+		passwordInput = (EditText) findViewById(R.id.EditText_Password);
+		autoSaveInput = (CheckBox) findViewById(R.id.CheckBox_AutoSave);
+		SaleApplication.ClearLogin();
+
+		ConfigUtil.Fill(config);
+		usernameInput.setText(config.Username);
+		passwordInput.setText(config.Password);
+		autoSaveInput.setChecked(config.SavePassword);
+
+		if (!StringUtil.IsNullOrEmpty(config.Username)
+				&& StringUtil.IsNullOrEmpty(config.Password)) {
+			passwordInput.requestFocus();
+		}
+		Button buttonCancel = (Button) this.findViewById(R.id.Button_Cancel);
+		buttonCancel.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View v) {
+				finish();
+
+			}
+		});
+
+		Button buttonLogin = (Button) findViewById(R.id.Button_OK);
+		buttonLogin.setOnClickListener(loginTask);
+		
+		Button btnSetUrl=(Button)findViewById(R.id.Button_SetUrl);
+		btnSetUrl.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				ServerConfig();				
+			}
+		});
+  		
+		checkUpdate();
+
+	}
+
+	private void checkUpdate() {
+		 Intent intent = new Intent();
+		 intent.setClass(this, UpdateService.class);
+		 startService(intent);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		checkUpdate();
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "服务器设置");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+		switch (item.getItemId()) {
+		case Menu.FIRST:
+			ServerConfig();
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	private void ServerConfig() {
+		Intent intent = new Intent();
+		intent.setClass(this.getBaseContext(), ServerConfigActivity.class);
+		startActivity(intent);
+
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		org.forks.ui.UIHelper.shutdowApp();
+
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+
+		switch (keyCode) {
+		case KeyEvent.KEYCODE_BACK:
+			new AlertDialog.Builder(this)
+					.setTitle("确定退出吗")
+					.setPositiveButton("确定",
+							new DialogInterface.OnClickListener() {
+
+								@Override
+								public void onClick(DialogInterface dialog,
+										int which) {
+									finish();
+								}
+							})
+					.setNegativeButton("取消",
+							new DialogInterface.OnClickListener() {
+
+								@Override
+								public void onClick(DialogInterface dialog,
+										int which) {
+
+									dialog.cancel();//
+								}
+							}).create().show();
+			break;
+		default:
+			break;
+		}
+		return false;
+
+	}
+}
diff --git a/src/BWP/MobileSale/LoginedActivity.java b/src/BWP/MobileSale/LoginedActivity.java
new file mode 100644
index 0000000..53fddbe
--- /dev/null
+++ b/src/BWP/MobileSale/LoginedActivity.java
@@ -0,0 +1,19 @@
+package BWP.MobileSale;
+
+import org.forks.jsonrpc.RpcFacade;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class LoginedActivity extends Activity {
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		if(!RpcFacade.isLogedIn()){
+			finish();
+			return;
+		}
+		SaleApplication.UpdateLastActiveTime();
+	}
+}
diff --git a/src/BWP/MobileSale/MainActivity.java b/src/BWP/MobileSale/MainActivity.java
new file mode 100644
index 0000000..6f92437
--- /dev/null
+++ b/src/BWP/MobileSale/MainActivity.java
@@ -0,0 +1,387 @@
+package BWP.MobileSale;
+
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import BWP.MobileSale.Approval.ApprovalListActivity;
+import BWP.MobileSale.BranchOrder.BranchOrderMainActivity;
+import BWP.MobileSale.BreedLog.BreedLogEditActivity;
+import BWP.MobileSale.BreedLog.BreedLogListActivity;
+import BWP.MobileSale.ChinaPay.ChinaPayMainActivity;
+import BWP.MobileSale.MobileAdjustGoodsBill.MobileAdjustGoodsBillMainActivity;
+import BWP.MobileSale.Order.OrderMainActivity;
+import BWP.MobileSale.RemainGoods.RemainGoodsMainActivity;
+import BWP.MobileSale.Return.ReturnMainActivity;
+import BWP.MobileSale.SaleOutStore.SaleOutStoreMainActivity;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DialogUtil;
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
+import android.opengl.Visibility;
+import android.os.Bundle;
+import android.os.StrictMode;
+import android.text.InputType;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class MainActivity extends LoginedActivity {
+
+	Button btnOrder = null;
+	Button btnReturn = null;
+	Button btnQuote = null;
+	Button btnChangePwd = null;
+	boolean enableSaleOrder = false;
+	boolean enableMobileAdjustGoodsBill = false;
+	boolean enableSaleXiWangEnable = false;	
+	boolean enableReturn = false;
+	boolean enableBranchOrder = false;
+	boolean enableSaleOutStore = false;
+	boolean enableChinaPay = false;	
+	boolean enableUserMessage = true;
+	@Override
+    public void onCreate(Bundle savedInstanceState) {   	
+
+
+    	
+        super.onCreate(savedInstanceState);
+        try {
+			initRoles();
+		} catch (JsonRpcException e) {
+			e.printStackTrace();
+		}
+        initImageButton();
+         
+        setContentView(mainLayout());
+     
+    }
+
+    private void initRoles() throws JsonRpcException
+    {
+    	String method="/Sale/Sale/Rpcs/MobileSaleClientRpc/OrderEnable";
+    	try {
+    		enableSaleOrder=RpcFacade.rpcCall(method);
+		} catch (Exception e) {
+		}
+    	
+    	 method="/Sale/Sale/Rpcs/MobileSaleClientRpc/MobileAdjustGoodsBillEnable";
+    	try {
+    		enableMobileAdjustGoodsBill = RpcFacade.rpcCall(method);
+		} catch (Exception e) {
+		}
+    	
+    	try {
+    		method="/Sale/Sale/Rpcs/MobileSaleClientRpc/ReturnEnable";
+        	enableReturn=RpcFacade.rpcCall(method);
+		} catch (Exception e) {
+		}
+    	
+    	try {
+    		method="/Sale/Sale/Rpcs/MobileSaleClientRpc/BranchOrderEnable";
+    		enableBranchOrder = RpcFacade.rpcCall(method);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}    	
+    	try {
+    		method="/Sale/Sale/Rpcs/MobileSaleClientRpc/SaleXiWangEnable";
+        	enableSaleXiWangEnable = RpcFacade.rpcCall(method);
+		} catch (Exception e) { 
+		}
+    	try {
+    		method="/Sale/Sale/Rpcs/MobileSaleClientRpc/SaleOutStoreEnable";
+    		enableSaleOutStore = RpcFacade.rpcCall(method);
+		} catch (Exception e) { 
+		}    	 	
+    	try {
+    		method="/Sale/SaleExportBase/ChinaPayRpc/ChinaPayEnable";
+    		enableChinaPay = RpcFacade.rpcCall(method);
+		} catch (Exception e) { 
+		}    	
+    }
+
+    private EditText oldInput;
+	private EditText newInput;
+	private EditText newInputR;
+	CallableTask changePasswordTask = new CallableTask(this, "修改密码中") {
+
+		public Object call() throws Exception {
+			
+			if(!newInput.getText().toString().equals(newInputR.getText().toString())){
+				throw new Exception("二次输入的新密码不同");
+			}
+			
+			String method = "/MainSystem/MainSystem/Rpcs/UserRpc/ChangePassword";
+			RpcFacade.rpcCall(method, oldInput.getText().toString(),newInput.getText().toString());		
+			return null;
+		}
+		
+		@Override
+		protected void successUI() {
+			DialogUtil.Alert(MainActivity.this, "您的密码修改成功");
+			
+		}
+	};
+
+	ImageView imageOrder = null;
+	ImageView imageMobileAdjustGoodsBill = null;
+	ImageView imageRemainGoods = null;
+	ImageView imageReturn = null;
+	ImageView imageRijie = null;
+	ImageView imageApproval = null;
+	ImageView imageBreedLog = null;
+	ImageView imageChangepwd = null;
+	ImageView imageUserMessage = null;
+	ImageView imageSaleOutStore = null;
+	ImageView imageChinaPay = null;	
+	private void initImageButton()
+	{
+		imageOrder=new ImageView(MainActivity.this);
+		//imageOrder.setImageResource(R.drawable.order);
+
+        Drawable dr = this.getResources().getDrawable(R.drawable.order); //取得图片资源
+		imageOrder.setBackgroundDrawable(dr);
+		imageOrder.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, OrderMainActivity.class);
+			}
+		});
+	
+		imageSaleOutStore=new ImageView(MainActivity.this);
+		imageSaleOutStore.setImageResource(R.drawable.outstore);
+		imageSaleOutStore.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, SaleOutStoreMainActivity.class);
+			}
+		});
+		
+		imageChinaPay=new ImageView(MainActivity.this);
+		imageChinaPay.setImageResource(R.drawable.pay);
+		imageChinaPay.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, ChinaPayMainActivity.class);
+			}
+		});		
+		
+		imageMobileAdjustGoodsBill=new ImageView(MainActivity.this);
+		//imageOrder.setImageResource(R.drawable.order);
+
+        Drawable dr2 = this.getResources().getDrawable(R.drawable.order); //取得图片资源
+        imageMobileAdjustGoodsBill.setBackgroundDrawable(dr2);
+        imageMobileAdjustGoodsBill.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, MobileAdjustGoodsBillMainActivity.class);
+			}
+		});
+	 
+		imageReturn=new ImageView(MainActivity.this);
+		imageReturn.setImageResource(R.drawable.returnrecord);
+		imageReturn.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, ReturnMainActivity.class);
+			}
+		});
+		
+		imageRemainGoods=new ImageView(MainActivity.this);
+		imageRemainGoods.setImageResource(R.drawable.remaingoods);
+		imageRemainGoods.setOnClickListener(new OnClickListener() { 
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, RemainGoodsMainActivity.class);
+			}
+		});		
+		
+		imageRijie=new ImageView(MainActivity.this);
+		imageRijie.setImageResource(R.drawable.rijie);
+		imageRijie.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, BranchOrderMainActivity.class);				
+			}
+		});
+
+	
+
+		imageUserMessage = new ImageView(MainActivity.this);
+		imageUserMessage.setImageResource(R.drawable.breedlog);
+		imageUserMessage.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, UserMessageActivity.class);				
+			}
+		});
+
+
+ 
+
+		
+		imageApproval=new ImageView(MainActivity.this);
+		imageApproval.setImageResource(R.drawable.approval);
+		imageApproval.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, ApprovalListActivity.class);
+			}
+		});
+		
+		
+		imageBreedLog=new ImageView(MainActivity.this);
+		imageBreedLog.setImageResource(R.drawable.breedlog);
+		imageBreedLog.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Utils.ActivityUtil.Go(MainActivity.this, BreedLogListActivity.class);
+			}
+		});
+		
+		
+		
+		imageChangepwd=new ImageView(MainActivity.this);
+		imageChangepwd.setImageResource(R.drawable.changepwd);
+		imageChangepwd.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				LinearLayout layout = new LinearLayout(MainActivity.this);
+				layout.setOrientation(LinearLayout.VERTICAL);
+				oldInput = new EditText(MainActivity.this);
+				oldInput.setHint("旧的密码");
+				oldInput.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
+				newInput = new EditText(MainActivity.this);
+				newInput.setHint("新的密码");
+				newInput.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
+				newInputR = new EditText(MainActivity.this);
+				newInputR.setHint("确认新密码");
+				newInputR.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
+				layout.addView(oldInput);
+				layout.addView(newInput);
+				layout.addView(newInputR);
+				new AlertDialog.Builder(MainActivity.this).setTitle("修改密码")
+				.setView(layout)
+				.setPositiveButton("修改",new DialogInterface.OnClickListener(){
+
+					public void onClick(DialogInterface dialog, int which) {
+						changePasswordTask.execute();
+					}
+				})
+				.setNegativeButton("取消", null)
+				.show();				
+			}
+		});
+	}
+
+	private LinearLayout mainLayout()
+	{
+		LinearLayout mayLayout = GetVLayoutWithBackgroud();
+		AddImageButtons(mayLayout, new ImageViewIcon[]{
+				new ImageViewIcon(imageOrder, "手机订单",enableSaleOrder),
+				new ImageViewIcon(imageSaleOutStore, "销售出库",enableSaleOutStore),				
+				new ImageViewIcon(imageReturn, "退货登记",enableReturn),
+				new ImageViewIcon(imageRijie, "门店日结",enableBranchOrder),
+				new ImageViewIcon(imageMobileAdjustGoodsBill, "手机调货单",enableMobileAdjustGoodsBill),
+				new ImageViewIcon(imageRemainGoods, "门店留货单",enableSaleXiWangEnable),
+				new ImageViewIcon(imageChinaPay, "收付捷支付",enableChinaPay),				
+				new ImageViewIcon(imageUserMessage, "用户消息",enableUserMessage),
+				new ImageViewIcon(imageChangepwd, "修改密码",true),
+				
+		});
+
+		return mayLayout;
+	}
+	
+	class ImageViewIcon{
+		ImageView imageView;
+		String imageViewName;
+		Boolean Enable;
+		public ImageViewIcon(ImageView image, String text, Boolean enable){
+			imageView = image;
+			imageViewName = text;
+			Enable = enable;
+		}
+	}
+	
+	private void AddImageButtons(LinearLayout layout,ImageViewIcon[] imageViews){
+		int count=0;
+		int max=4;
+		LinearLayout lineLayout = null;
+		for(int i=0;i<imageViews.length;i++){
+			if(!imageViews[i].Enable)
+				continue;
+			if(count==max)
+				count=0;
+			if(count==0){
+				lineLayout=GetHLayout(max);
+				
+				TextView view1=new TextView(this);		
+				layout.addView(view1);
+				layout.addView(lineLayout);
+			}
+			lineLayout.addView(ImageAndTextView(imageViews[i].imageView, imageViews[i].imageViewName));
+			count++;
+		}
+	}
+	
+	private LinearLayout GetHLayout(int maxCount){
+		LinearLayout hLayout=new LinearLayout(MainActivity.this);
+		hLayout.setOrientation(LinearLayout.HORIZONTAL);
+		hLayout.setLayoutParams(new LinearLayout.LayoutParams(
+				LinearLayout.LayoutParams.MATCH_PARENT,
+				LinearLayout.LayoutParams.WRAP_CONTENT));
+		
+		TextView view=new TextView(this);
+		view.setText("zha");
+		view.setVisibility(maxCount);
+		hLayout.addView(view);
+		return hLayout;
+	}
+	
+	private LinearLayout GetVLayoutWithBackgroud(){
+		LinearLayout vLayout=new LinearLayout(MainActivity.this);
+		vLayout.setOrientation(LinearLayout.VERTICAL);
+		vLayout.setLayoutParams(new LinearLayout.LayoutParams(
+				LinearLayout.LayoutParams.MATCH_PARENT,
+				LinearLayout.LayoutParams.MATCH_PARENT));
+		vLayout.setBackgroundResource(R.drawable.bg2);
+		return vLayout;
+	}
+	
+	private LinearLayout ImageAndTextView(ImageView image,String text)
+	{
+		LinearLayout layout=new LinearLayout(MainActivity.this);
+		layout.setOrientation(LinearLayout.VERTICAL);
+		
+		layout.setLayoutParams(	new LinearLayout.LayoutParams(
+				LinearLayout.LayoutParams.WRAP_CONTENT,
+				LinearLayout.LayoutParams.WRAP_CONTENT));
+		
+		
+		
+		TextView view=new TextView(MainActivity.this);
+		view.setText("  "+text);
+		
+		layout.addView(image);
+		layout.addView(view);
+		
+		return layout;
+	}
+	
+}
diff --git a/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillDetailEditActivity.java b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillDetailEditActivity.java
new file mode 100644
index 0000000..47c8359
--- /dev/null
+++ b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillDetailEditActivity.java
@@ -0,0 +1,59 @@
+package BWP.MobileSale.MobileAdjustGoodsBill;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.StringUtil;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+public class MobileAdjustGoodsBillDetailEditActivity extends LoginedActivity{
+
+	private TextView textViewGoodsName;
+	private EditText editTextNumber;
+	private int position;
+	private HashMap<String,Object> detail;
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.mobileadjustgoodsbill_detail_edit);
+		Intent intent = getIntent();
+		position = intent.getIntExtra("Position", -1);
+		detail = (HashMap<String, Object>) intent.getSerializableExtra("Detail");		
+		textViewGoodsName = ActivityUtil.Find(this, R.id.TextView_Goods_Name);
+		editTextNumber = ActivityUtil.Find(this, R.id.EditText_Number);
+		
+		textViewGoodsName.setText(StringUtil.ToString(detail.get("Goods_Name")));
+		editTextNumber.setText(StringUtil.ToString(detail.get("UnitNum")));
+		
+		Button buttonOK = ActivityUtil.Find(this, R.id.Button_OK);
+		Button buttonCancel = ActivityUtil.Find(this, R.id.Button_Cancel);
+		buttonOK.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View v) {
+				detail.put("UnitNum", StringUtil.ParseMoney(editTextNumber.getText().toString()));
+				Intent intent =new Intent();
+				intent.putExtra("Detail", detail);
+				intent.putExtra("Position", position);
+				ActivityUtil.Finish(MobileAdjustGoodsBillDetailEditActivity.this, intent);				
+			}
+		});
+		
+		buttonCancel.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View v) {
+				finish();				
+			}
+		});
+	}
+	
+	
+}
diff --git a/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillEditActivity.java b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillEditActivity.java
new file mode 100644
index 0000000..387248d
--- /dev/null
+++ b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillEditActivity.java
@@ -0,0 +1,705 @@
+package BWP.MobileSale.MobileAdjustGoodsBill;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.ManyList;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.SelectBuyerActivity;
+import BWP.MobileSale.SelectGoodsActivity;
+import BWP.MobileSale.SelectRemarkActivity;
+import BWP.MobileSale.Config.LoginUserConfig;
+import BWP.MobileSale.Order.OrderDetailEditActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.OnPromptListener;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import BWP.widget.SelectSimpleAdapter;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.InputType;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.app.Activity;
+
+public class MobileAdjustGoodsBillEditActivity extends LoginedActivity {
+	static final int RequestCode_SelectOutBuyer = 1;
+	static final int RequestCode_SelectGoods = 2;
+	static final int RequestCode_Open = 3; // 打开单据
+	static final int RequestCode_EditDetail = 4;
+	static final int RequestCode_SelectRemark = 5;
+	static final int RequestCode_SelectInBuyer = 6;
+
+	private long mBillID;
+	private RpcObject mDmo;
+	private boolean mEnableSave = true;
+	boolean mEnableDelete = false;
+	boolean mEnableCheck = false;
+	boolean mEnableLockAdjustOutDate = false;
+	private TextView button_Date;
+	private TextView textViewRemark;
+	private ListView listView;
+	private TextView textView_AdjustOutBuyerName;
+	private TextView textView_AdjustInBuyerName;
+	private TextView textViewDetailCount;
+	private TextView textViewDetailNum;
+	private int selectedPosition = -1;
+	private int firstVisiblePosition;
+	public static RpcObject EditingDetail;
+	
+	private static final int Option_FindDetail = 0;
+
+	private static final int Option_ClearDetail = 1;
+	private LoginUserConfig config = new LoginUserConfig(this);
+	private boolean flag = false;
+	
+	CallableTask initBillTask = new CallableTask(this, "读取单据中...") {
+		public Object call() throws Exception {
+			String method2 = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/EnableLockAdjustOutDate";
+			mEnableLockAdjustOutDate = RpcFacade.rpcCall(method2);
+			if (mBillID > 0) {
+				String method = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/Load";
+				mDmo = RpcFacade.rpcCall(method, mBillID);
+				method = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/EnableCheck";
+				mEnableCheck = RpcFacade.rpcCall(method, mBillID);
+			} else {
+				mDmo = RpcObject.create("/Sale/Sale/BO/AdjustGoodsBill");
+				mDmo.setDate("AdjustOutDate", new Date());
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			mEnableSave = mDmo.getNamedValue("BillState").getValue() == 0;
+			mEnableDelete = mDmo.getNamedValue("BillState").getValue() == 0;
+			initControls();
+			 applyToUI();
+		}
+
+	};
+	
+	private void applyToUI() {
+		if (mDmo == null) {
+			DialogUtil.Alert(MobileAdjustGoodsBillEditActivity.this, "当前可编辑的对象为空");
+			finish();
+			return;
+		}
+
+		if (mBillID > 0) {
+			this.setTitle(String.format("%s-手机调货单No.%s(%s)",
+					getString(R.string.app_name), mBillID,
+					mDmo.getNamedValue("BillState")));
+		}
+
+		textView_AdjustOutBuyerName.setText(mDmo.getString("AdjustOutBuyer_Name"));
+		String aaString = mDmo.getString("AdjustInBuyer_Name");
+		TextView aaTextView = (TextView)findViewById(R.id.AdjustInBuyerName);
+		aaTextView.setText(aaString);
+
+		button_Date.setText(DateTimeUtil.FormatDate(mDmo.getDate("AdjustOutDate")));
+		textViewRemark.setText(mDmo.getString("Remark"));
+		ManyList details = mDmo.getManyList("OutDetails");
+
+		BigDecimal allMoney = new BigDecimal(0);
+		BigDecimal allNum = new BigDecimal(0);
+		for (int i = 0; i < details.size(); i++) {
+			RpcObject item = details.get(i);
+			BigDecimal price = item.getMoney("Price");
+			if (price == null) {
+				price = new BigDecimal(0);
+			}
+			BigDecimal number = item.getMoney("UnitNum");
+			if (number == null) {
+				number = new BigDecimal(0);
+			}
+			allMoney = allMoney.add(price.multiply(number));
+			allNum=allNum.add(number);
+					
+		}
+
+		textViewDetailCount.setText(String.format("%s ￥%.2f", details.size(),
+				allMoney));
+		textViewDetailNum.setText(String.format("%s", allNum));
+
+		SelectSimpleAdapter adapter = new SelectSimpleAdapter(
+				MobileAdjustGoodsBillEditActivity.this, details,
+				R.layout.return_edit_detail_list_item, new String[] {
+						"Goods_Name", "UnitNum", "Price" }, new int[] {
+						R.id.Goods_Name, R.id.Number, R.id.Price });
+		adapter.setSelect(selectedPosition);
+		listView.setAdapter(adapter);
+		if (firstVisiblePosition == -1) {
+			firstVisiblePosition = details.size() - 1;
+		} else if (firstVisiblePosition > details.size() - 1) {
+			firstVisiblePosition = details.size() - 1;
+		}
+		listView.setSelection(firstVisiblePosition);
+	}
+	
+
+	private void initControls() {
+		InitButtonReturn();
+
+		InitButtonSave();
+
+		InitButtonCheck();
+
+		 InitButtonDelete();
+
+		 InitListView();
+
+		 InitRemark();
+
+		 InitBuyer();
+
+		 InitDate();
+	}
+	private void InitListView() {
+		textViewDetailCount = ActivityUtil
+				.Find(this, R.id.AdjustGoodsBill_TextView_DetailCount);
+		textViewDetailNum=ActivityUtil.Find(this, R.id.AdjustGoodsBill_TextView_DetailNum);
+		listView = ActivityUtil.Find(this, R.id.Order_ListView);
+		Button selectGoods = ActivityUtil.Find(this, R.id.AdjustGoodsBill_Button_SelectGoods);
+		selectGoods.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				if(mDmo.getLong("AdjustOutBuyer_ID") == null){
+					Toast.makeText(getApplicationContext(), "请先选择调出购货客户！", 1).show();
+					return;
+				}
+				if(mDmo.getDate("AdjustOutDate") == null){
+					Toast.makeText(getApplicationContext(), "请先选择调出时间！", 1).show();
+					return;
+				}
+				Intent intent = new Intent();
+				intent.putExtra("Buyer_ID", mDmo.getLong("AdjustOutBuyer_ID"));
+				//intent.putExtra("AccountingUnit_ID", mDmo.getLong("AccountingUnit_ID"));
+				button_Date = (TextView)findViewById(R.id.AdjustGoodsBill_Button_Date);
+				intent.putExtra("Date", button_Date.getText());
+				intent.putExtra("IsOrNotShowSecond", false);
+				intent.setClass(arg0.getContext(), SelectGoodsActivity.class);
+				startActivityForResult(intent, RequestCode_SelectGoods);
+			}
+
+		});
+
+		if (!mEnableSave) {
+			selectGoods.setVisibility(View.GONE);
+			return;
+		}
+		listView.setOnItemLongClickListener(new OnItemLongClickListener() {
+
+			public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
+					final int arg2, long arg3) {
+				new AlertDialog.Builder(arg1.getContext()).setItems(
+						new CharSequence[] { "删除", "取消" },
+						new DialogInterface.OnClickListener() {
+
+							public void onClick(DialogInterface dialog,
+									int which) {
+								if (which == 0) {
+									selectedPosition = -1;
+									mDmo.getManyList("OutDetails").remove(arg2);
+									applyToUI();
+								}
+							}
+
+						}).show();
+				
+				return true;
+			}
+
+		});
+
+		listView.setOnScrollListener(new OnScrollListener() {
+
+			public void onScroll(AbsListView arg0, int arg1, int arg2, int arg3) {
+				// TODO Auto-generated method stub
+
+			}
+
+			public void onScrollStateChanged(AbsListView arg0, int arg1) {
+				if (arg1 == OnScrollListener.SCROLL_STATE_IDLE) {
+					firstVisiblePosition = listView.getFirstVisiblePosition();
+				}
+
+			}
+
+		});
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+				
+			public void onItemClick(AdapterView<?> arg0, View arg1,
+					int position, long arg3) {
+				
+				if(button_Date.getText()==null || button_Date.getText() == ""){
+					Toast.makeText(getApplicationContext(), "请先选调出日期！", 1).show();
+				}
+				selectedPosition = position;
+				RpcObject result = mDmo.getManyList("OutDetails").get(position);
+				EditingDetail = result;
+				Intent intent = new Intent();
+				intent.setClass(arg1.getContext(),
+						MobileAdjustGoodsBillDetailEditActivity.class);
+				HashMap<String, Object> map = new HashMap<String, Object>();
+				Iterator<Entry<String, Object>> iterator = result.entrySet()
+						.iterator();
+				while (iterator.hasNext()) {
+					Entry<String, Object> entry = iterator.next();
+					String cccString = entry.getKey();
+					if(cccString.equals("Goods_ConvertMode")){
+						continue;
+					}
+					map.put(entry.getKey(), entry.getValue());
+				}
+				intent.putExtra("Detail", map);
+				intent.putExtra("Position", position);
+				startActivityForResult(intent, RequestCode_EditDetail);
+
+			}
+
+		});
+	}
+	
+	private void InitDate() {
+		button_Date = ActivityUtil.Find(this, R.id.AdjustGoodsBill_Button_Date);
+		if (!mEnableSave) {
+			button_Date.setHint("");
+			return;
+		}
+		if(!mEnableLockAdjustOutDate){
+			button_Date.setEnabled(false);
+		}
+		button_Date.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				OnDateSetListener onDateSetListener = new DatePickerDialog.OnDateSetListener() {
+
+					public void onDateSet(DatePicker datePicker, int year,
+							int month, int day) {
+						Calendar calendar = Calendar.getInstance();
+						calendar.set(year, month, day);
+						Date date = DateTimeUtil.RemoveTime(calendar.getTime());
+						mDmo.setDate("AdjustOutDate", date);
+						applyToUI();
+					}
+
+				};
+				String dateStr = button_Date.getText().toString();
+				Calendar calendar = DateTimeUtil.SafeParseCalendar(dateStr);
+
+				new DatePickerDialog(arg0.getContext(), onDateSetListener,
+						calendar.get(Calendar.YEAR), calendar
+								.get(Calendar.MONTH), calendar
+								.get(Calendar.DAY_OF_MONTH)).show();
+
+			}
+
+		});
+	}
+	private void InitBuyer() {
+		
+		//调出客户
+		textView_AdjustOutBuyerName = ActivityUtil.Find(this, R.id.AdjustOutBuyerName);
+		Button searchOutBuyerButton = ActivityUtil.FindButton(this,
+				R.id.SelectAdjustOutBuyer);
+		if (!mEnableSave) {
+			searchOutBuyerButton.setVisibility(View.GONE);
+			return;
+		}
+
+		searchOutBuyerButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.putExtra("BuyerType", "调出客户");
+				intent.setClass(arg0.getContext(), SelectBuyerActivity.class);
+				startActivityForResult(intent, RequestCode_SelectOutBuyer);
+			}
+
+		});
+		//调入客户
+		textView_AdjustInBuyerName = ActivityUtil.Find(this, R.id.AdjustInBuyerName);
+		Button searchInBuyerButton = ActivityUtil.FindButton(this,
+				R.id.SelectAdjustInBuyer);
+		if (!mEnableSave) {
+			searchInBuyerButton.setVisibility(View.GONE);
+			return;
+		}
+		searchInBuyerButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.putExtra("UserVsCustomerSet", false);
+				intent.setClass(arg0.getContext(), SelectBuyerActivity.class);
+				startActivityForResult(intent, RequestCode_SelectInBuyer);
+			}
+
+		});
+	}
+	private void InitRemark() {
+		if (mEnableSave) {
+			textViewRemark = ActivityUtil.Find(this, R.id.AdjustGoodsBill_EditText_Remark);
+			ActivityUtil.Find(this, R.id.AdjustGoodsBill_EditText_Remark).setVisibility(
+					View.GONE);
+
+			Button searchRemarkButton = ActivityUtil.FindButton(this,
+					R.id.AdjustGoodsBill_Button_SelectRemark);
+
+			searchRemarkButton.setOnClickListener(new OnClickListener() {
+
+				public void onClick(View arg0) {
+					Intent intent = new Intent();
+					intent.setClass(arg0.getContext(),
+							SelectRemarkActivity.class);
+					startActivityForResult(intent, RequestCode_SelectRemark);
+				}
+
+			});
+		} else {
+			textViewRemark = ActivityUtil.Find(this, R.id.AdjustGoodsBill_EditText_Remark);
+			textViewRemark.setVisibility(
+					View.GONE);
+			ActivityUtil.FindButton(this, R.id.AdjustGoodsBill_Button_SelectRemark).setVisibility(
+					View.GONE);
+		}
+	}
+	private void InitButtonDelete() {
+		deleteTask.setPrompt("确定要删除吗?");
+		Button buttonDelete = ActivityUtil.Find(this, R.id.AdjustGoodsBill_Delete);
+		if (!mEnableDelete) {
+			buttonDelete.setVisibility(View.GONE);
+		}
+		buttonDelete.setOnClickListener(deleteTask);
+	}
+
+	ViewOnClickTask deleteTask = new ViewOnClickTask(this, "删除中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/Delete";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.Alert(MobileAdjustGoodsBillEditActivity.this, "删除成功");
+			Intent intent = new Intent();
+			ActivityUtil.Finish(MobileAdjustGoodsBillEditActivity.this, intent);
+		}
+	};
+	
+	private void InitButtonCheck() {
+		Button btnCheck = ActivityUtil.FindButton(this, R.id.AdjustGoodsBill_Check);
+		if (!mEnableCheck) {
+			btnCheck.setVisibility(View.GONE);
+		}
+		btnCheck.setOnClickListener(checkTask);
+	}
+	ViewOnClickTask checkTask = new ViewOnClickTask(this, "审核中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/Check";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(MobileAdjustGoodsBillEditActivity.this, "审核成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(MobileAdjustGoodsBillEditActivity.this, MobileAdjustGoodsBillEditActivity.class);
+			startActivityIfNeeded(intent, MobileAdjustGoodsBillEditActivity.RequestCode_Open);
+
+		}
+	};
+	private void InitButtonSave() {
+		Button btnSave = ActivityUtil.FindButton(this, R.id.AdjustGoodsBill_Save);
+		if (!mEnableSave) {
+			btnSave.setVisibility(View.GONE);
+		}
+		btnSave.setOnClickListener(saveTask);
+	}
+	
+
+	private void InitButtonReturn() {
+		Button btnSave = ActivityUtil.FindButton(this, R.id.AdjustGoodsBill_Return);
+		btnSave.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+	}
+	
+	
+	ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") {
+		public Object call() throws Exception {
+			mDmo.setString("Remark", textViewRemark.getText().toString());
+			if (mBillID > 0) {
+				String userName = config.getStore().getString("Username", "");
+				if(!userName.equals(mDmo.getString("CreateUser_Name"))){
+					flag = true;
+				}else{
+				String method = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/Update";
+				RpcFacade.rpcCall(method, mDmo);
+				}
+			} else {
+				String method = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/Insert";
+				mBillID = RpcFacade.rpcCall(method, mDmo);
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			    if(flag){
+			    	Toast.makeText(getApplicationContext(), "保存失败，不允许编辑别人的调货单！",2).show();
+			    }else{
+				Toast.makeText(getApplicationContext(), "保存成功", 1).show();
+			    
+				finish();
+				Intent intent = new Intent();
+				intent.putExtra("ID", mBillID);
+				intent.setClass(MobileAdjustGoodsBillEditActivity.this, MobileAdjustGoodsBillEditActivity.class);
+				startActivityIfNeeded(intent, MobileAdjustGoodsBillEditActivity.RequestCode_Open);
+			    }
+	};
+	};
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.mobileadjustgoodsbill_edit);
+		Intent intent = getIntent();
+		mBillID = intent.getLongExtra("ID", 0);
+		initBillTask.execute();
+	}
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+		super.onActivityResult(requestCode, resultCode, intent);
+		if (resultCode != Activity.RESULT_OK) {
+			return;
+		}
+		
+
+		switch (requestCode) {
+		case RequestCode_SelectOutBuyer:
+			ReceiveSelectOutBuyerResult(intent);
+			break;
+		case RequestCode_SelectInBuyer:
+			ReceiveSelectInBuyerResult(intent);
+			break;
+		case RequestCode_SelectGoods:
+			ReceiveSelectGoodsResult(intent);
+			break;
+		case RequestCode_EditDetail:
+			ReceiveEditDetail(intent);
+			break;
+		case RequestCode_SelectRemark:
+			ReceiveSelectRemarkResult(intent);
+			break;
+		}
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	private void ReceiveEditDetail(Intent intent) {
+		int position = intent.getIntExtra("Position", -1);
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Detail");
+		RpcObject detail = mDmo.getManyList("OutDetails").get(position);
+		detail.setMoney("UnitNum", (BigDecimal) map.get("UnitNum"));
+		applyToUI();
+	}
+
+	private void ReceiveSelectGoodsResult(Intent intent) {
+		firstVisiblePosition = listView.getBottom();
+		Object[] result = (Object[]) intent.getSerializableExtra("Result");
+		ManyList details = mDmo.getManyList("OutDetails");
+		for (Object item : result) {
+			@SuppressWarnings("unchecked")
+			HashMap<String, Object> map = (HashMap<String, Object>) item;
+			try {
+				RpcObject detail = RpcObject.create("/Sale/Sale/BO/AdjustGoodsBill_OutDetail");
+				detail.setLong("Goods_ID", (Long) map.get("ID"));
+				detail.setString("Goods_Name", (String) map.get("Name"));
+				detail.setString("Goods_Code", (String) map.get("Code"));
+				detail.setString("Goods_Spell", (String) map.get("Spell"));
+				detail.setMoney("UnitNum", (BigDecimal) map.get("Number"));
+				detail.setMoney("Price", (BigDecimal) map.get("Price"));
+				details.add(detail);
+			} catch (JsonRpcException e) {
+				e.printStackTrace();
+			}
+		}
+		applyToUI();
+	}
+	@SuppressWarnings("unchecked")
+	private void ReceiveSelectOutBuyerResult(Intent intent) {
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Result");
+		mDmo.setString("AdjustOutBuyer_Name", (String) map.get("Name"));
+		mDmo.setLong("AdjustOutBuyer_ID", (Long) map.get("ID"));
+		applyToUI();
+	}
+
+	@SuppressWarnings("unchecked")
+	private void ReceiveSelectInBuyerResult(Intent intent) {
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Result");
+		mDmo.setString("AdjustInBuyer_Name", (String) map.get("Name"));
+		mDmo.setLong("AdjustInBuyer_ID", (Long) map.get("ID"));
+		applyToUI();
+	}
+	
+	private void ReceiveSelectRemarkResult(Intent intent) {
+		String Remark = (String) intent.getSerializableExtra("Result");
+		mDmo.setString("Remark", Remark);
+		applyToUI();
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Option_FindDetail, 0, "查找明细");
+		menu.add(0, Option_ClearDetail, 1, "清空明细");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	String detailSearchKey;
+	CallableTask searchDetailTask = new CallableTask(this, "") {
+
+		private int searchResult;
+
+		public Object call() throws Exception {
+			searchResult = -1;
+			ManyList details = mDmo.getManyList("OutDetails");
+			for (int i = 0; i < details.size(); i++) {
+				RpcObject item = details.get(i);
+				if (MatchDetail(item, detailSearchKey)) {
+					searchResult = i;
+					break;
+				}
+			}
+
+			Log.d("OrderEdit", String.format("退货登记单明细搜索结果:%s", searchResult));
+
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		private boolean MatchDetail(RpcObject item, String detailSearchKey) {
+			String spell = item.getString("Goods_Spell");
+			if (spell.contains(detailSearchKey)) {
+				return true;
+			}
+			String code = item.getString("Goods_Code");
+			if (code.contains(detailSearchKey)) {
+				return true;
+			}
+			String goodsName = item.getString("Goods_Name");
+			if (goodsName.contains(detailSearchKey)) {
+				return true;
+			}
+			return false;
+		}
+
+		@Override
+		protected void successUI() {
+			if (searchResult >= 0) {
+				selectedPosition = searchResult;
+				firstVisiblePosition = searchResult;
+				applyToUI();
+			} else {
+				DialogUtil
+						.AutoHiddenAlert(MobileAdjustGoodsBillEditActivity.this, "没有查找到匹配的明细");
+			}
+		}
+	};
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Option_FindDetail:
+			DialogUtil.Prompt(MobileAdjustGoodsBillEditActivity.this, "存货明细查找", "支持名称编码拼音首字母",
+					"", InputType.TYPE_CLASS_TEXT, new OnPromptListener() {
+						public void OnPrompt(String prompt) {
+							detailSearchKey = prompt;
+							searchDetailTask.execute();
+						}
+
+						@Override
+						public void OnPrompt2(HashMap<String, Object> prompt) {
+							// TODO Auto-generated method stub
+							
+						}
+					});
+			break;
+		case Option_ClearDetail:
+			DialogUtil.Confirm(MobileAdjustGoodsBillEditActivity.this, "确定要清空明细吗?", "是", "否",
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							selectedPosition = -1;
+							mDmo.getManyList("OutDetails").clear();
+							applyToUI();
+						}
+					});
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		switch(keyCode){
+		case KeyEvent.KEYCODE_BACK:
+			DialogUtil.Confirm(this, "您按了返回按钮,是否返回?", "是","否", new android.content.DialogInterface.OnClickListener(){
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					finish();
+				}
+				
+			});
+			return false;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+
+	}
+
diff --git a/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillListActivity.java b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillListActivity.java
new file mode 100644
index 0000000..bcbc4ff
--- /dev/null
+++ b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillListActivity.java
@@ -0,0 +1,223 @@
+package BWP.MobileSale.MobileAdjustGoodsBill;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.DialogUtil.SetDate;
+import BWP.MobileSale.Util.StringUtil;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.SimpleAdapter.ViewBinder;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.app.Activity;
+
+public class MobileAdjustGoodsBillListActivity extends LoginedActivity {
+	ListView listView;
+	private SimpleAdapter adapter;
+	private Button buttonDate;
+	private Button btnRefresh;
+
+	private Spinner filter;
+	private Spinner billStateFilter;
+	
+	
+	String[] columnNames = new String[]{"ID","OutMoney","AdjustOutBuyer_Name","AdjustOutDate","BillState"};
+	
+	int[] columnIDs = new int[]{R.id.TextView1,R.id.TextView2,R.id.TextView3,R.id.TextView_Date,R.id.TextView_BillState};
+	
+	
+	class SumInfo{
+		public int RowCount;
+		public BigDecimal Money;
+		@Override
+		public String toString() {
+			return String.format("共%s条记录,%s元",RowCount,Money);
+		}
+		
+	}
+	
+	SumInfo mSumInfo = new SumInfo();
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/Search";
+			RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+			
+			Resources resource = getResources();
+			String searchkey = (String) filter.getSelectedItem();
+			argument.setString("SearchKey", searchkey);
+		
+			argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());
+			
+			String dateText = buttonDate.getText().toString();
+			if(!StringUtil.IsNullOrEmpty(dateText)){
+				Date parseDate = DateTimeUtil.ParseDate(dateText);
+				argument.setDate("Date1", parseDate);
+			}
+			
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			mSumInfo.RowCount = rows.size();
+			mSumInfo.Money = new BigDecimal(0);
+			for(RpcObject row:rows){
+				mSumInfo.Money = mSumInfo.Money.add(row.getMoney("OutMoney"));
+			}
+			
+			
+			adapter = new SimpleAdapter(MobileAdjustGoodsBillListActivity.this, rows,
+					R.layout.order_list_item, columnNames,columnIDs);
+			adapter.setViewBinder(viewBinder);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+
+
+	};
+	ViewBinder viewBinder = new ViewBinder() {
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.TextView_Date) {
+				((TextView)view).setText(DateTimeUtil.FormatDate((Date) data));
+				return true;
+			}
+			else{
+				return false;
+			}
+		}
+	};
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.mobileadjustgoodsbill_list);
+		initButtonRefresh();
+		
+		initListView();
+
+		initFilter();
+		
+		initButtonDate();
+
+		StartQuery();
+	}
+	
+	private void initButtonRefresh()
+	{
+		btnRefresh=(Button)findViewById(R.id.Button_Refresh);
+		btnRefresh.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				StartQuery();
+			}
+		});
+		
+	}
+	
+	
+	private void StartQuery() {
+		searchTask.execute();
+	}
+	
+	private void initButtonDate() {
+		buttonDate = ActivityUtil.FindButton(this, R.id.Button_Date);
+		DialogUtil.AddSelectDateDialog(buttonDate, new SetDate() {
+
+			public void setDate(Date date) {
+				StartQuery();
+			}
+
+		});
+	}
+	
+	private void initFilter() {
+		filter = ActivityUtil.Find(this, R.id.Spinner_Filter);
+		billStateFilter = (Spinner) findViewById(R.id.Spinner_BillStateFilter);
+		
+		OnItemSelectedListener listener = new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				StartQuery();
+				
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+				
+			}
+		};
+		
+		filter.setOnItemSelectedListener(listener);
+		billStateFilter.setOnItemSelectedListener(listener);
+		
+	}
+	
+	private void initListView() {
+		listView = ActivityUtil.Find(this, R.id.ListView);
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("ID", (Long) map.get("ID"));
+				intent.setClass(arg1.getContext(), MobileAdjustGoodsBillEditActivity.class);
+				startActivityForResult(intent,MobileAdjustGoodsBillEditActivity.RequestCode_Open);
+			}
+
+		});
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "刷新");
+		menu.add(0,2,1,"统计");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Menu.FIRST:
+			StartQuery();
+			break;
+		case 2:
+			DialogUtil.Alert(this, mSumInfo.toString());
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+}
diff --git a/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillMainActivity.java b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillMainActivity.java
new file mode 100644
index 0000000..6fad806
--- /dev/null
+++ b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillMainActivity.java
@@ -0,0 +1,46 @@
+package BWP.MobileSale.MobileAdjustGoodsBill;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+import BWP.MobileSale.Order.OrderSetUserProfileActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+
+public class MobileAdjustGoodsBillMainActivity extends LoginedActivity {
+	 
+@Override
+protected void onCreate(Bundle savedInstanceState) {
+	super.onCreate(savedInstanceState);
+	setContentView(R.layout.mobileadjustgoodsbill_main);
+	
+	Button buttonOrderEdit = (Button)findViewById(R.id.Button_Main_MobileAdjustGoodsBillEdit);
+	buttonOrderEdit.setOnClickListener(new OnClickListener() {
+		
+		public void onClick(View arg0) {
+			Utils.ActivityUtil.Go(arg0, MobileAdjustGoodsBillEditActivity.class);
+		}
+	});
+	
+	Button buttonOrderList = (Button)findViewById(R.id.Button_Main_MobileAdjustGoodsBillList);
+	buttonOrderList.setOnClickListener(new OnClickListener(){
+
+		public void onClick(View arg0) {
+			Utils.ActivityUtil.Go(arg0, MobileAdjustGoodsBillListActivity.class);				
+		}
+		
+	});
+	
+	Button buttonUserSet = (Button)findViewById(R.id.Button_Main_MobileAdjustGoodsBillSetUserProfile);
+	buttonUserSet.setOnClickListener(new OnClickListener(){
+		
+		public void onClick(View arg0) {
+			Utils.ActivityUtil.Go(arg0, MobileAdjustGoodsBillSetUserProfileActivity.class);				
+		}
+		
+	});
+}
+}
diff --git a/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillSetUserProfileActivity.java b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillSetUserProfileActivity.java
new file mode 100644
index 0000000..0352ff9
--- /dev/null
+++ b/src/BWP/MobileSale/MobileAdjustGoodsBill/MobileAdjustGoodsBillSetUserProfileActivity.java
@@ -0,0 +1,131 @@
+package BWP.MobileSale.MobileAdjustGoodsBill;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Config.LoginUserConfig;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.ConfigUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+
+public class MobileAdjustGoodsBillSetUserProfileActivity extends LoginedActivity {
+
+	
+	Spinner spAccountUnit;
+	private LoginUserConfig config = new LoginUserConfig(this);
+	private RpcObject mDmo;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.mobileadjustgoodsbill_setuserprofile);
+		loadTask.execute();
+	}
+	
+	CallableTask loadTask = new CallableTask(MobileAdjustGoodsBillSetUserProfileActivity.this, "读取中...") 
+	{
+
+		@Override
+		public Object call() throws Exception {
+			ConfigUtil.Fill(config);
+			
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/LoadUserProfile";
+			mDmo = RpcFacade.rpcCall(method, config.Username);
+			if(mDmo==null)
+			{
+				mDmo=RpcObject.create("/Sale/Sale/BO/UserProfile");
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {			
+			try {
+				initControls();				
+			} catch (JsonRpcException e) {
+				DialogUtil.Alert(MobileAdjustGoodsBillSetUserProfileActivity.this, e.getDetailMessage());
+				e.printStackTrace();
+			}
+		}
+		
+	};
+	
+	private void initControls() throws JsonRpcException
+	{
+		initAccountUnit();
+		initButton();
+	}
+	
+	private void initButton()
+	{
+		Button btnReturn=(Button)findViewById(R.id.mobileadjustgoodsbill_SetUser_Ruturn);
+		btnReturn.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		
+		Button btnSave=(Button)findViewById(R.id.mobileadjustgoodsbill_SetUser_Save);
+		btnSave.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				saveTask.execute();
+				
+			}
+		});
+	}
+	
+	CallableTask saveTask = new CallableTask(MobileAdjustGoodsBillSetUserProfileActivity.this, "保存中...") 
+	{
+		@Override
+		public Object call() throws Exception {
+			
+			//UpdateUserProfile
+			mDmo.setString("MobileAdjustGoodsBill_AccountingUnit_Name", (String)spAccountUnit.getSelectedItem());
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/UpdateUserProfile";	
+			
+			RpcFacade.rpcCall(method,config.Username,mDmo);
+			
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(MobileAdjustGoodsBillSetUserProfileActivity.this, "保存成功");
+			finish();
+		}
+		
+	};
+	
+	
+	private void initAccountUnit() throws JsonRpcException
+	{
+		spAccountUnit=(Spinner)findViewById(R.id.order_setuser_setaccountunit);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadAccountingUnit";		
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}		
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(MobileAdjustGoodsBillSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		spAccountUnit.setAdapter(adapter);
+		spAccountUnit.setSelection(list.indexOf(mDmo.getString("MobileAdjustGoodsBill_AccountingUnit_Name")));
+	}
+}
diff --git a/src/BWP/MobileSale/Order/OrderDetailEditActivity.java b/src/BWP/MobileSale/Order/OrderDetailEditActivity.java
new file mode 100644
index 0000000..6d5d5e2
--- /dev/null
+++ b/src/BWP/MobileSale/Order/OrderDetailEditActivity.java
@@ -0,0 +1,290 @@
+package BWP.MobileSale.Order;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.SelectBatchNoActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.StringUtil;
+import android.app.Activity;
+import android.app.Application;
+import android.content.Intent;
+import android.media.ThumbnailUtils;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class OrderDetailEditActivity extends LoginedActivity{
+
+	private TextView textViewGoodsName;
+	private EditText editTextNumber,editTextSecondNumber;
+	private EditText editTextPrice,remarkText;
+	private int position;
+	private boolean isOrNotShowSecond;
+	private boolean isEditSecond;
+	private boolean isEditMain;
+	private boolean showRemark;	
+	private long buyer_ID;
+	private BigDecimal policyPrice;
+	private HashMap<String,Object> detail;
+	private TextView batchNo_ID;
+	private TextView batchNo_Name;
+	final int RequestCode_SelectBatchNo = 1;
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (resultCode != Activity.RESULT_OK) {
+			return;
+		}
+		if(requestCode == RequestCode_SelectBatchNo){
+			HashMap<String, Object> map = (HashMap<String, Object>) data
+					.getSerializableExtra("Result");
+			Object id = (Object) map.get("ID");
+			batchNo_ID.setText(id.toString());
+			batchNo_Name.setText((String)map.get("Name"));
+
+		}
+	}
+	
+	Date date;
+	long accountingUnit_ID;
+	static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.order_detail_edit);
+		Intent intent = getIntent();
+		position = intent.getIntExtra("Position", -1);
+		isOrNotShowSecond = intent.getBooleanExtra("IsOrNotShowSecond", false);
+		isEditSecond = intent.getBooleanExtra("IsEditSecond", true);
+		isEditMain = intent.getBooleanExtra("IsEditMain", true);
+		showRemark = intent.getBooleanExtra("ShowRemark", false);		
+		buyer_ID = intent.getLongExtra("Buyer_ID",0);
+		String dateStr = intent.getStringExtra("Date");
+		try {
+			date = dateFormat.parse(dateStr);
+		} catch (Exception e) {
+			
+		}
+		if(intent.getSerializableExtra("AccountingUnit_ID") == null){
+			accountingUnit_ID = 0;
+		}else{
+			accountingUnit_ID = Long.parseLong(intent.getSerializableExtra("AccountingUnit_ID").toString());
+		}
+		
+
+		detail = (HashMap<String, Object>) intent.getSerializableExtra("Detail");
+		
+		String method = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsOrNotShowPolicyPrice";
+		Boolean result = RpcFacade.rpcCall(method);
+		if(!result){
+			LinearLayout policyPriceLayout = (LinearLayout)this.findViewById(R.id.policyPriceLayout);
+			policyPriceLayout.setVisibility(View.GONE);
+		}
+		String method2 = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckEditPriceRole";
+		boolean hasEditPriceRole = RpcFacade.rpcCall(method2);
+		editTextPrice = ActivityUtil.Find(this, R.id.EditText_Price);
+		if(!hasEditPriceRole){
+			LinearLayout priceLayout = (LinearLayout)this.findViewById(R.id.priceLayout);
+			priceLayout.setVisibility(View.GONE);
+		}else{
+			editTextPrice.setText(StringUtil.ToString(detail.get("Price")));
+		}
+		remarkText= ActivityUtil.Find(this, R.id.EditText_Remark);
+		if (showRemark) {
+			remarkText.setText(StringUtil.ToString(detail.get("Remark")));
+		} else {
+			LinearLayout priceLayout = (LinearLayout) this .findViewById(R.id.remarkLayout);
+			priceLayout.setVisibility(View.GONE);
+		}
+		
+		textViewGoodsName = ActivityUtil.Find(this, R.id.TextView_Goods_Name);
+		editTextNumber = ActivityUtil.Find(this, R.id.EditText_Number);
+		editTextNumber.setEnabled(isEditMain);
+		editTextSecondNumber = ActivityUtil.Find(this, R.id.EditText_SecondNumber);
+		editTextSecondNumber.setEnabled(isEditSecond);				
+		textViewGoodsName.setText(StringUtil.ToString(detail.get("Goods_Name")));
+		editTextNumber.setText(StringUtil.ToString(detail.get("Number")));
+		
+		String method3 = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsOrNotShowBatchNo";
+		final boolean isOrNotShowBatchNo = RpcFacade.rpcCall(method3);
+		if(isOrNotShowBatchNo){
+		
+		batchNo_ID = ActivityUtil.Find(this, R.id.BatchNo_ID);
+		batchNo_Name = ActivityUtil.Find(this, R.id.BatchNo);
+		batchNo_ID.setText(StringUtil.ToString(detail.get("BatchNo_ID")));
+		batchNo_Name.setText(StringUtil.ToString(detail.get("BatchNo_Name")));
+		Button btn = (Button)findViewById(R.id.SelectBatchNo);
+		btn.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent();
+				intent.setClass(getApplicationContext(), SelectBatchNoActivity.class);
+				startActivityForResult(intent, RequestCode_SelectBatchNo);
+				
+			}
+		});
+		}else{
+			LinearLayout batchNoLayout = (LinearLayout)findViewById(R.id.batchNoLayout);
+			batchNoLayout.setVisibility(View.GONE);
+		}
+		if(!isOrNotShowSecond){
+			editTextSecondNumber.setVisibility(View.GONE);
+			TextView secondTextView = (TextView)ActivityUtil.Find(this, R.id.TextView_SecondNumber);
+			secondTextView.setVisibility(View.GONE);
+		}else{
+			editTextSecondNumber.setText(StringUtil.ToString(detail.get("SecondNumber")));	
+		}
+		Button buttonOK = ActivityUtil.Find(this, R.id.Button_OK);
+		Button buttonCancel = ActivityUtil.Find(this, R.id.Button_Cancel);
+		buttonOK.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View v) {
+				detail.put("Number", StringUtil.ParseMoney(editTextNumber.getText().toString()));
+				detail.put("Remark", remarkText.getText().toString() );				
+				if(isOrNotShowSecond){
+					detail.put("SecondNumber", StringUtil.ParseMoney(editTextSecondNumber.getText().toString()));
+				}
+				if(isOrNotShowSecond){
+					detail.put("Price", StringUtil.ParseMoney(editTextPrice.getText().toString()));
+				}
+				if(isOrNotShowBatchNo){
+					if(batchNo_ID.getText()!=null && batchNo_ID.getText()!=""){
+					detail.put("BatchNo_ID", Long.parseLong(batchNo_ID.getText().toString()));
+					detail.put("BatchNo_Name", batchNo_Name.getText().toString());
+					}
+				}
+				detail.put("PolicyPrice", policyPrice);
+				Intent intent =new Intent();
+				intent.putExtra("Detail", detail);
+				intent.putExtra("Position", position);
+				ActivityUtil.Finish(OrderDetailEditActivity.this, intent);				
+			}
+		});
+		
+		buttonCancel.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View v) {
+				finish();				
+			}
+		});
+		if(isOrNotShowSecond){
+		editTextNumber.addTextChangedListener(
+				new TextWatcher() {
+					
+					@Override
+					public void onTextChanged(CharSequence s, int start, int before, int count) {
+						if(editTextNumber.hasFocus()){
+						BigDecimal number =  StringUtil.ParseMoney(s.toString());
+						Object goods_SecondaryUnit1RelativeRatio =  detail.get("Goods_SecondaryUnit1RelativeRatio");
+						Object goods_SecondaryUnit1Ratio =  detail.get("Goods_SecondaryUnit1Ratio");
+						if(number!=null&&goods_SecondaryUnit1Ratio!=null&&goods_SecondaryUnit1RelativeRatio!=null){
+							BigDecimal mainUnitNum = ((number).divide(((BigDecimal)detail.get("LeftRatio")),6,BigDecimal.ROUND_HALF_EVEN)).multiply(((BigDecimal)detail.get("RightRatio")));
+							BigDecimal secondNumber = (mainUnitNum.multiply((BigDecimal)goods_SecondaryUnit1RelativeRatio)).divide((BigDecimal)goods_SecondaryUnit1Ratio,6,BigDecimal.ROUND_HALF_EVEN);
+							editTextSecondNumber.setText(secondNumber.toString());
+							
+						}
+						}
+						
+					}
+					
+					@Override
+					public void beforeTextChanged(CharSequence s, int start, int count,
+							int after) {
+						// TODO Auto-generated method stub
+						
+					}
+					
+					@Override
+					public void afterTextChanged(Editable s) {
+						
+						
+					}
+				}
+				);
+		
+		editTextSecondNumber.addTextChangedListener(
+				new TextWatcher() {
+					
+					@Override
+					public void onTextChanged(CharSequence s, int start, int before, int count) {
+						if(editTextSecondNumber.hasFocus()){
+						BigDecimal secondNumber =  StringUtil.ParseMoney(s.toString());
+						Object goods_SecondaryUnit1RelativeRatio =  detail.get("Goods_SecondaryUnit1RelativeRatio");
+						Object goods_SecondaryUnit1Ratio =  detail.get("Goods_SecondaryUnit1Ratio");
+						if(secondNumber!=null&&goods_SecondaryUnit1Ratio!=null&&goods_SecondaryUnit1RelativeRatio!=null){
+							BigDecimal mainUnitNum = (((BigDecimal)secondNumber).multiply(((BigDecimal)goods_SecondaryUnit1Ratio))).divide(((BigDecimal)goods_SecondaryUnit1RelativeRatio));
+							BigDecimal number = (mainUnitNum.divide((BigDecimal)detail.get("RightRatio"))).multiply((BigDecimal)detail.get("LeftRatio"));
+							editTextNumber.setText(number.toString());
+							
+						}
+						}
+					}
+					
+					@Override
+					public void beforeTextChanged(CharSequence s, int start, int count,
+							int after) {
+						// TODO Auto-generated method stub
+						
+					}
+					
+					@Override
+					public void afterTextChanged(Editable s) {
+						
+						
+					}
+				}
+				);
+		}
+		if(result){
+		initBillTask.execute();
+		}
+	}
+	
+	CallableTask initBillTask = new CallableTask(this, "读取价格中...") {
+		public Object call() throws Exception {
+			if (buyer_ID > 0) {
+				String method = "/Sale/Sale/Rpcs/MobileOrderRpc/GetPolicyPrice";
+				BigDecimal result;
+				if(accountingUnit_ID > 0){
+					result = RpcFacade.rpcCall(method, (Long)detail.get("Goods_ID"),buyer_ID,date,accountingUnit_ID);
+				}else{
+				  result = RpcFacade.rpcCall(method, (Long)detail.get("Goods_ID"),buyer_ID,date,null);
+				}
+				if(result!= new BigDecimal(0)){
+					policyPrice = result;
+				}
+			} 
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			if(policyPrice!= new BigDecimal(0)){
+				SetPolicyPriceText();
+			}
+		}
+	};
+	
+	private void SetPolicyPriceText() {
+		TextView textViewPolicyPrice = ActivityUtil.Find(this, R.id.TextView_PolicyPrice);
+		textViewPolicyPrice.setText(policyPrice.toString());
+	}
+	
+}
diff --git a/src/BWP/MobileSale/Order/OrderEditActivity.java b/src/BWP/MobileSale/Order/OrderEditActivity.java
new file mode 100644
index 0000000..453d91e
--- /dev/null
+++ b/src/BWP/MobileSale/Order/OrderEditActivity.java
@@ -0,0 +1,875 @@
+package BWP.MobileSale.Order;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.ManyList;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.SelectAccountingUnitActivity;
+import BWP.MobileSale.SelectBuyerActivity;
+import BWP.MobileSale.SelectGoodsActivity;
+import BWP.MobileSale.SelectRemarkActivity;
+import BWP.MobileSale.SelectStoreActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.OnPromptListener;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import BWP.widget.SelectSimpleAdapter;
+import android.R.bool;
+import android.R.string;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.opengl.Visibility;
+import android.os.Bundle;
+import android.text.InputType;
+import android.text.format.Time;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class OrderEditActivity extends LoginedActivity {
+
+	public static RpcObject EditingDetail;
+
+	static final int RequestCode_SelectBuyer = 1;
+	static final int RequestCode_SelectGoods = 2;
+	static final int RequestCode_Open = 3; // 打开单据
+	static final int RequestCode_EditDetail = 4;
+	static final int RequestCode_SelectRemark = 5;
+	static final int RequestCode_SelectAccountingUnit = 6;
+	static final int RequestCode_SelectStore = 7;
+	
+	
+	private static final int Option_FindDetail = 0;
+
+	private static final int Option_ClearDetail = 1;
+
+	private TextView textView_BuyerName;
+	private TextView textView_Balance;
+	private TextView textView_AccountingUnit;
+	private TextView textView_StoreName;
+	private long mBillID;
+	private RpcObject mDmo;
+	private int selectedPosition = -1;
+
+	private boolean mEnableSave = true;
+	boolean mEnableCheck = false;
+	boolean mEnableUnCheck = false;	
+	boolean mEnableDelete = false;
+	boolean mShowUnCheck = false;	
+	private TextView button_Date;
+	private TextView textViewRemark;
+	private ListView listView;
+
+	private TextView textViewDetailCount;
+	String detailSearchKey;
+	private int firstVisiblePosition;
+	private Button btnReturn;
+	private boolean isOrNotShowBalance;
+	private boolean isOrNotShowSecond;
+	private boolean isOrNotShowAccountingUnitAndStore;
+	private boolean isEditSecond,isEditMain,showRemark;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.order_edit);
+		Intent intent = getIntent();
+		mBillID = intent.getLongExtra("ID", 0);
+		btnReturn = (Button)this.findViewById(R.id.Order_Button_Return);
+		CheckVisibale();
+		if(!isOrNotShowBalance){
+			this.findViewById(R.id.balanceLayout).setVisibility(View.GONE);
+			}
+		btnReturn.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		initBillTask.execute();
+	}
+	
+	private void CheckVisibale() {
+		try {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsOrNotShowBalance";
+			isOrNotShowBalance = RpcFacade.rpcCall(method);
+			String method2 = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsOrNotShowSecond";
+			isOrNotShowSecond = RpcFacade.rpcCall(method2);
+			String method3 = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsOrNotShowAccountingUnitAndStore";
+			isOrNotShowAccountingUnitAndStore = RpcFacade.rpcCall(method3);
+			String method4 = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsEditSecond";
+			isEditSecond = RpcFacade.rpcCall(method4);
+			String method5 = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsEditMain";
+			isEditMain = RpcFacade.rpcCall(method5);
+		} catch (Exception e) {
+
+		}
+		try {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/ShowRemark";
+			showRemark = RpcFacade.rpcCall(method);
+		} catch (Exception e) {
+
+		}
+	}
+
+	
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode,
+			Intent intent) {
+		super.onActivityResult(requestCode, resultCode, intent);
+
+		if (resultCode != Activity.RESULT_OK) {
+			return;
+		}
+
+		switch (requestCode) {
+		case RequestCode_SelectBuyer:
+			ReceiveSelectBuyerResult(intent);
+			break;
+		case RequestCode_SelectGoods:
+			ReceiveSelectGoodsResult(intent);
+			break;
+		case RequestCode_EditDetail:
+			ReceiveEditDetail(intent);
+			break;
+		case RequestCode_SelectRemark:
+			ReceiveSelectRemarkResult(intent);
+			break;
+		case RequestCode_SelectStore:
+			ReceiveSelectStoreResult(intent);
+			break;
+		case RequestCode_SelectAccountingUnit:
+			ReceiveSelectAccountingUnitResult(intent);
+			break;
+		}
+
+	}
+	
+	@SuppressWarnings("unchecked")
+	private void ReceiveSelectAccountingUnitResult(Intent intent) {	
+			HashMap<String, Object> map = (HashMap<String, Object>) intent
+					.getSerializableExtra("Result");
+			mDmo.setString("AccountingUnit_Name", (String) map.get("Name"));
+			mDmo.setLong("AccountingUnit_ID", (Long) map.get("ID"));
+			applyToUI();
+	}
+
+	private void ReceiveSelectStoreResult(Intent intent) {
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Result");
+		mDmo.setString("Store_Name", (String) map.get("Name"));
+		mDmo.setLong("Store_ID", (Long) map.get("ID"));
+		applyToUI();
+	}
+
+	CallableTask initBillTask = new CallableTask(this, "读取单据中...") {
+		public Object call() throws Exception {
+			if (mBillID > 0) {
+				String method = "/Sale/Sale/Rpcs/MobileOrderRpc/Load";
+				mDmo = RpcFacade.rpcCall(method, mBillID);
+				method = "/Sale/Sale/Rpcs/MobileOrderRpc/EnableCheck";
+				mEnableCheck = RpcFacade.rpcCall(method, mBillID);
+				method = "/Sale/Sale/Rpcs/MobileOrderRpc/EnableUnCheck";
+				mEnableUnCheck = RpcFacade.rpcCall(method, mBillID);
+			} else {
+				mDmo = RpcObject.create("/Sale/Sale/BO/MobileOrder");
+				mDmo.setDate("Date", new Date());
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			mEnableSave = mDmo.getNamedValue("BillState").getValue() == 0;
+			mEnableDelete = mDmo.getNamedValue("BillState").getValue() == 0;
+			mShowUnCheck =  mDmo.getNamedValue("BillState").getValue() == 1;
+			initControls();
+			applyToUI();
+		}
+
+	};
+	private void initControls() {
+		
+		InitButtonSave();
+
+		InitButtonCheck();
+		InitButtonUnCheck();
+		InitButtonDelete();
+
+		InitListView();
+
+		InitRemark();
+
+		InitBuyer();
+
+		InitDate();
+		
+		InitStore();
+		
+		InitAccountingUnit();
+	}
+	private void InitDate() {
+		button_Date = ActivityUtil.Find(this, R.id.Order_Button_Date);
+		if (!mEnableSave) {
+			button_Date.setHint("");
+			return;
+		}
+		button_Date.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				OnDateSetListener onDateSetListener = new DatePickerDialog.OnDateSetListener() {
+
+					public void onDateSet(DatePicker datePicker, int year,
+							int month, int day) {
+						Calendar calendar = Calendar.getInstance();
+						calendar.set(year, month, day);
+						Date date = DateTimeUtil.RemoveTime(calendar.getTime());
+						mDmo.setDate("Date", date);
+						applyToUI();
+					}
+
+				};
+				String dateStr = button_Date.getText().toString();
+				Calendar calendar = DateTimeUtil.SafeParseCalendar(dateStr);
+
+				new DatePickerDialog(arg0.getContext(), onDateSetListener,
+						calendar.get(Calendar.YEAR), calendar
+								.get(Calendar.MONTH), calendar
+								.get(Calendar.DAY_OF_MONTH)).show();
+
+			}
+
+		});
+	}
+	private void InitBuyer() {
+		textView_BuyerName = ActivityUtil.Find(this, R.id.Order_TextView_BuyerName);
+		if(isOrNotShowBalance){
+			textView_Balance = ActivityUtil.Find(this, R.id.Order_TextView_Balance);
+		}
+		Button searchBuyerButton = ActivityUtil.FindButton(this,
+				R.id.Order_Button_SelectBuyer);
+		if (!mEnableSave) {
+			searchBuyerButton.setVisibility(View.GONE);
+			return;
+		}
+
+		searchBuyerButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.setClass(arg0.getContext(), SelectBuyerActivity.class);
+				startActivityForResult(intent, RequestCode_SelectBuyer);
+			}
+
+		});
+	}
+	
+	private void InitAccountingUnit() {
+		LinearLayout layout = (LinearLayout)findViewById(R.id.accountingUnitUI);
+		if(!isOrNotShowAccountingUnitAndStore){
+			return;
+		}
+		layout.setVisibility(View.VISIBLE);
+		textView_AccountingUnit = ActivityUtil.Find(this, R.id.Order_TextView_AccountingUnit);
+		Button searchButton = ActivityUtil.FindButton(this,
+				R.id.Order_Button_SelectAccountingUnit);
+		if (!mEnableSave) {
+			searchButton.setVisibility(View.GONE);
+			return;
+		}
+
+		searchButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.setClass(arg0.getContext(), SelectAccountingUnitActivity.class);
+				startActivityForResult(intent, RequestCode_SelectAccountingUnit);
+			}
+
+		});
+	}
+	
+	private void InitStore() {
+		LinearLayout layout = (LinearLayout)findViewById(R.id.storeUI);
+		if(!isOrNotShowAccountingUnitAndStore){
+			
+			return;
+		}
+		layout.setVisibility(View.VISIBLE);
+		textView_StoreName = ActivityUtil.Find(this, R.id.Order_TextView_Store);
+		
+		Button searchButton = ActivityUtil.FindButton(this,
+				R.id.Order_Button_SelectStore);
+		if (!mEnableSave) {
+			searchButton.setVisibility(View.GONE);
+			return;
+		}
+
+		searchButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.setClass(arg0.getContext(), SelectStoreActivity.class);
+				startActivityForResult(intent, RequestCode_SelectStore);
+			}
+
+		});
+	}
+	
+	
+	//摘要
+	private void InitRemark() {
+		if (mEnableSave) {
+			textViewRemark = ActivityUtil.Find(this, R.id.Order_EditText_Remark);
+			ActivityUtil.Find(this, R.id.Order_TextView_Remark).setVisibility(
+					View.GONE);
+
+			Button searchRemarkButton = ActivityUtil.FindButton(this,
+					R.id.Order_Button_SelectRemark);
+
+			searchRemarkButton.setOnClickListener(new OnClickListener() {
+
+				public void onClick(View arg0) {
+					Intent intent = new Intent();
+					intent.setClass(arg0.getContext(),
+							SelectRemarkActivity.class);
+					startActivityForResult(intent, RequestCode_SelectRemark);
+				}
+
+			});
+		} else {
+			textViewRemark = ActivityUtil.Find(this, R.id.Order_TextView_Remark);
+			ActivityUtil.Find(this, R.id.Order_EditText_Remark).setVisibility(
+					View.GONE);
+			ActivityUtil.FindButton(this, R.id.Order_Button_SelectRemark).setVisibility(
+					View.GONE);
+		}
+	}
+	//ListView
+	private void InitListView() {
+		textViewDetailCount = ActivityUtil
+				.Find(this, R.id.Order_TextView_DetailCount);
+		listView = ActivityUtil.Find(this, R.id.Order_ListView);
+		Button selectGoods = ActivityUtil.Find(this, R.id.Order_Button_SelectGoods);
+		selectGoods.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				if(mDmo.getLong("Buyer_ID") == null){
+					Toast.makeText(getApplicationContext(), "请先选择购货客户！", 1).show();
+					return;
+				}
+				if(mDmo.getDate("Date") == null){
+					Toast.makeText(getApplicationContext(), "请先选择到货时间！", 1).show();
+					return;
+				}
+				
+				Intent intent = new Intent();
+				intent.putExtra("Buyer_ID", mDmo.getLong("Buyer_ID"));
+				intent.putExtra("AccountingUnit_ID", mDmo.getLong("AccountingUnit_ID"));
+				Date date = mDmo.getDate("Date");
+				button_Date = (TextView)findViewById(R.id.Order_Button_Date);
+				intent.putExtra("Date", button_Date.getText());
+				intent.putExtra("IsOrNotShowSecond", isOrNotShowSecond);
+				intent.putExtra("IsEditSecond", isEditSecond);
+				intent.putExtra("IsEditMain", isEditMain);
+				intent.putExtra("ShowRemark", showRemark);				
+				intent.setClass(arg0.getContext(), SelectGoodsActivity.class);
+				startActivityForResult(intent, RequestCode_SelectGoods);
+			}
+
+		});
+
+		if (!mEnableSave) {
+			selectGoods.setVisibility(View.GONE);
+			return;
+		}
+		listView.setOnItemLongClickListener(new OnItemLongClickListener() {
+
+			public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
+					final int arg2, long arg3) {
+				new AlertDialog.Builder(arg1.getContext()).setItems(
+						new CharSequence[] { "删除", "取消" },
+						new DialogInterface.OnClickListener() {
+
+							public void onClick(DialogInterface dialog,
+									int which) {
+								if (which == 0) {
+									selectedPosition = -1;
+									mDmo.getManyList("Details").remove(arg2);
+									applyToUI();
+								}
+							}
+
+						}).show();
+
+				return true;
+			}
+
+		});
+
+		listView.setOnScrollListener(new OnScrollListener() {
+
+			public void onScroll(AbsListView arg0, int arg1, int arg2, int arg3) {
+				// TODO Auto-generated method stub
+
+			}
+
+			public void onScrollStateChanged(AbsListView arg0, int arg1) {
+				if (arg1 == OnScrollListener.SCROLL_STATE_IDLE) {
+					firstVisiblePosition = listView.getFirstVisiblePosition();
+				}
+
+			}
+
+		});
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			public void onItemClick(AdapterView<?> arg0, View arg1,
+					int position, long arg3) {
+				System.out.println("run to this");
+				if(button_Date.getText()==null || button_Date.getText() == ""){
+					Toast.makeText(getApplicationContext(), "请先选择到货时间！", 1).show();
+				}
+				selectedPosition = position;
+				RpcObject result = mDmo.getManyList("Details").get(position);
+				EditingDetail = result;
+				Intent intent = new Intent();
+				intent.setClass(arg1.getContext(),
+						OrderDetailEditActivity.class);
+				intent.putExtra("Position", position);
+				intent.putExtra("IsOrNotShowSecond", isOrNotShowSecond);
+				intent.putExtra("Buyer_ID", mDmo.getLong("Buyer_ID"));
+				intent.putExtra("Date", button_Date.getText());
+				intent.putExtra("AccountingUnit_ID", mDmo.getLong("AccountingUnit_ID"));
+				intent.putExtra("IsEditSecond", isEditSecond);
+				intent.putExtra("IsEditMain", isEditMain);
+				intent.putExtra("ShowRemark", showRemark);				
+				HashMap<String, Object> map = new HashMap<String, Object>();
+				Iterator<Entry<String, Object>> iterator = result.entrySet()
+						.iterator();
+				while (iterator.hasNext()) {
+					Entry<String, Object> entry = iterator.next();
+					String cccString = entry.getKey();
+					if(cccString.equals("Goods_ConvertMode")){
+						continue;
+					}
+					map.put(entry.getKey(), entry.getValue());
+				}
+				intent.putExtra("Detail", map);
+				startActivityForResult(intent, RequestCode_EditDetail);
+			}
+
+		});
+	}
+	
+	//删除
+	private void InitButtonDelete() {
+		deleteTask.setPrompt("确定要删除吗?");
+		Button buttonDelete = ActivityUtil.Find(this, R.id.Order_Button_Delete);
+		if (!mEnableDelete) {
+			buttonDelete.setVisibility(View.GONE);
+		}
+		buttonDelete.setOnClickListener(deleteTask);
+	}
+	ViewOnClickTask deleteTask = new ViewOnClickTask(this, "删除中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/Delete";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.Alert(OrderEditActivity.this, "删除成功");
+			Intent intent = new Intent();
+			ActivityUtil.Finish(OrderEditActivity.this, intent);
+
+		}
+	};
+	
+	//审核
+	private void InitButtonCheck() {
+		Button buttonSave = ActivityUtil.Find(this, R.id.Order_Button_Check);
+		if (!mEnableCheck) {
+			buttonSave.setVisibility(View.GONE);
+		}
+		buttonSave.setOnClickListener(checkTask);
+
+	}
+	ViewOnClickTask checkTask = new ViewOnClickTask(this, "审核中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/Check";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(OrderEditActivity.this, "审核成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(OrderEditActivity.this, OrderEditActivity.class);
+			startActivityForResult(intent, OrderEditActivity.RequestCode_Open);
+
+		}
+	};
+	
+	private void InitButtonUnCheck() {
+		Button buttonSave = ActivityUtil.Find(this, R.id.Order_Button_UnCheck);
+		if (!mEnableUnCheck||!mShowUnCheck) {
+			buttonSave.setVisibility(View.GONE);
+		}
+		buttonSave.setOnClickListener(unCheckTask);
+
+	}
+	
+	ViewOnClickTask unCheckTask = new ViewOnClickTask(this, "撤销中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/UnCheck";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(OrderEditActivity.this, "撤销成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(OrderEditActivity.this, OrderEditActivity.class);
+			startActivityForResult(intent, OrderEditActivity.RequestCode_Open);
+
+		}
+	};
+	//保存
+	private void InitButtonSave() {
+		Button buttonSave = ActivityUtil.Find(this, R.id.Order_Button_Save);
+		if (!mEnableSave) {
+			buttonSave.setVisibility(View.GONE);
+		}
+		buttonSave.setOnClickListener(saveTask);
+	}
+	ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") {
+		public Object call() throws Exception {
+			mDmo.setString("Remark", textViewRemark.getText().toString());
+			if (mBillID > 0) {
+				String method = "/Sale/Sale/Rpcs/MobileOrderRpc/Update";
+				RpcFacade.rpcCall(method, mDmo);
+			} else {
+				String method = "/Sale/Sale/Rpcs/MobileOrderRpc/Insert";
+				mBillID = RpcFacade.rpcCall(method, mDmo);
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(OrderEditActivity.this, "保存成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(OrderEditActivity.this, OrderEditActivity.class);
+			startActivityForResult(intent, OrderEditActivity.RequestCode_Open);
+		}
+
+	};
+	
+	private void applyToUI() {
+		if (mDmo == null) {
+			DialogUtil.Alert(OrderEditActivity.this, "当前可编辑的对象为空");
+			finish();
+			return;
+		}
+
+		if (mBillID > 0) {
+			this.setTitle(String.format("%s-订单No.%s(%s)",
+					getString(R.string.app_name), mBillID,
+					mDmo.getNamedValue("BillState")));
+		}
+
+		textView_BuyerName.setText(mDmo.getString("Buyer_Name"));
+		button_Date.setText(DateTimeUtil.FormatDate(mDmo.getDate("Date")));
+		textViewRemark.setText(mDmo.getString("Remark"));
+		if(isOrNotShowBalance){
+			SetBalance();
+		}
+		if(isOrNotShowAccountingUnitAndStore){
+			textView_AccountingUnit.setText(mDmo.getString("AccountingUnit_Name"));
+			textView_StoreName.setText(mDmo.getString("Store_Name"));
+		}
+		ManyList details = mDmo.getManyList("Details");
+
+		BigDecimal allMoney = new BigDecimal(0);
+		for (int i = 0; i < details.size(); i++) {
+			RpcObject item = details.get(i);
+			BigDecimal price = item.getMoney("Price");
+			if (price == null) {
+				price = new BigDecimal(0);
+			}
+			BigDecimal number = item.getMoney("Number");
+			if (number == null) {
+				number = new BigDecimal(0);
+			}
+			allMoney = allMoney.add(price.multiply(number));
+		}
+
+		textViewDetailCount.setText(String.format("%s￥%.2f", details.size(),
+				allMoney));
+
+		SelectSimpleAdapter adapter = new SelectSimpleAdapter(
+				OrderEditActivity.this, details,
+				R.layout.order_edit_detail_list_item, new String[] {
+						"Goods_Name", "Number","SecondNumber", "Price","BatchNo_Name" }, new int[] {
+						R.id.Goods_Name, R.id.Number,R.id.SecondNumber, R.id.Price,R.id.BatchNo });
+		adapter.setSelect(selectedPosition);
+		listView.setAdapter(adapter);
+		if (firstVisiblePosition == -1) {
+			firstVisiblePosition = details.size() - 1;
+		} else if (firstVisiblePosition > details.size() - 1) {
+			firstVisiblePosition = details.size() - 1;
+		}
+		listView.setSelection(firstVisiblePosition);
+		 
+				
+	}
+	
+
+	@SuppressWarnings("unchecked")
+	private void ReceiveEditDetail(Intent intent) {
+		int position = intent.getIntExtra("Position", -1);
+		RpcObject detail = mDmo.getManyList("Details").get(position);
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Detail");
+		detail.setMoney("Number", (BigDecimal) map.get("Number"));
+		detail.setMoney("SecondNumber", (BigDecimal) map.get("SecondNumber"));
+		detail.setMoney("Price", (BigDecimal) map.get("Price"));
+		detail.setMoney("PolicyPrice", (BigDecimal) map.get("PolicyPrice"));
+		detail.setString("Remark", (String) map.get("Remark"));		
+		if(map.get("BatchNo_ID")!=null){
+			detail.setLong("BatchNo_ID", (Long) map.get("BatchNo_ID"));
+			detail.setString("BatchNo_Name", (String) map.get("BatchNo_Name"));
+		}
+		applyToUI();
+		
+	}
+
+	private void ReceiveSelectGoodsResult(Intent intent) {
+		firstVisiblePosition = listView.getBottom();
+		Object[] result = (Object[]) intent.getSerializableExtra("Result");
+		ManyList details = mDmo.getManyList("Details");
+		for (Object item : result) {
+			@SuppressWarnings("unchecked")
+			HashMap<String, Object> map = (HashMap<String, Object>) item;
+			try {
+				RpcObject detail = RpcObject
+						.create("/Sale/Sale/BO/MobileOrder_Detail");
+				detail.setLong("Goods_ID", (Long) map.get("ID"));
+				detail.setString("Goods_Name", (String) map.get("Name"));
+				detail.setString("Goods_Code", (String) map.get("Code"));
+				detail.setString("Goods_Spell", (String) map.get("Spell"));
+				detail.setMoney("Number", (BigDecimal) map.get("Number"));
+				detail.setMoney("SecondNumber", (BigDecimal) map.get("SecondNumber"));
+				detail.setMoney("Price", (BigDecimal) map.get("Price"));
+				detail.setMoney("Goods_SecondaryUnit1RelativeRatio", (BigDecimal) map.get("Goods_SecondaryUnit1RelativeRatio"));
+				detail.setMoney("Goods_SecondaryUnit1Ratio", (BigDecimal) map.get("Goods_SecondaryUnit1Ratio"));
+				detail.setMoney("LeftRatio", (BigDecimal) map.get("LeftRatio"));
+				detail.setMoney("RightRatio", (BigDecimal) map.get("RightRatio"));
+				detail.setLong("BatchNo_ID", (Long) map.get("BatchNo_ID"));
+				detail.setString("BatchNo_Name", (String) map.get("BatchNo_Name"));		
+				detail.setString("Remark", (String) map.get("remark"));
+				if(details.size() > 0){
+				if(detail.getLong("BatchNo_ID") == null){
+					RpcObject orderDetail = details.get(details.size()-1);
+					detail.setLong("BatchNo_ID", orderDetail.getLong("BatchNo_ID"));
+					detail.setString("BatchNo_Name", orderDetail.getString("BatchNo_Name"));
+				}
+				}
+				detail.setMoney("PolicyPrice", (BigDecimal)map.get("PolicyPrice"));
+				
+				details.add(detail);
+			} catch (JsonRpcException e) {
+				e.printStackTrace();
+			}
+		}
+		applyToUI();
+	}
+
+	private void GetLeftAndRightRatio(Long buyer_ID, Long goods_ID,RpcObject detail) {
+		String method = "/Sale/Sale/Rpcs/MobileOrderRpc/GetLeftAndRightRatio";
+		RpcObject orderDetail = RpcFacade.rpcCall(method, buyer_ID,goods_ID);
+		if(orderDetail!=null){
+			detail.setMoney("Goods_SecondaryUnit1Ratio", orderDetail.getMoney("Goods_SecondaryUnit1Ratio"));
+			detail.setMoney("Goods_SecondaryUnit1RelativeRatio", orderDetail.getMoney("Goods_SecondaryUnit1RelativeRatio"));
+			detail.setMoney("LeftRatio", orderDetail.getMoney("LeftRatio"));
+			detail.setMoney("LeftRatio", orderDetail.getMoney("LeftRatio"));
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private void ReceiveSelectBuyerResult(Intent intent) {
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Result");
+		mDmo.setString("Buyer_Name", (String) map.get("Name"));
+		mDmo.setLong("Buyer_ID", (Long) map.get("ID"));
+		applyToUI();
+	}
+	
+	private void SetBalance(){
+		String method = "/Sale/Sale/Rpcs/MobileOrderRpc/GetBlance";
+		BigDecimal balance = RpcFacade.rpcCall(method, mDmo.getLong("Buyer_ID"));
+		if(balance!=null){
+			textView_Balance.setText(balance.toString());
+		}else{
+			textView_Balance.setText("");
+		}
+	}
+
+	private void ReceiveSelectRemarkResult(Intent intent) {
+		String Remark = (String) intent.getSerializableExtra("Result");
+		mDmo.setString("Remark", Remark);
+		applyToUI();
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Option_FindDetail, 0, "查找明细");
+		menu.add(0, Option_ClearDetail, 1, "清空明细");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Option_FindDetail:
+			DialogUtil.Prompt(OrderEditActivity.this, "存货明细查找", "支持名称编码拼音首字母",
+					"", InputType.TYPE_CLASS_TEXT, new OnPromptListener() {
+						public void OnPrompt(String prompt) {
+							detailSearchKey = prompt;
+							searchDetailTask.execute();
+						}
+
+						@Override
+						public void OnPrompt2(HashMap<String, Object> prompt) {
+							// TODO Auto-generated method stub
+							
+						}
+					});
+			break;
+		case Option_ClearDetail:
+			DialogUtil.Confirm(OrderEditActivity.this, "确定要清空明细吗?", "是", "否",
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							selectedPosition = -1;
+							mDmo.getManyList("Details").clear();
+							applyToUI();
+						}
+					});
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		switch(keyCode){
+		case KeyEvent.KEYCODE_BACK:
+			DialogUtil.Confirm(this, "您按了返回按钮,是否返回?", "是","否", new android.content.DialogInterface.OnClickListener(){
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					finish();
+				}
+				
+			});
+			return false;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+	
+	CallableTask searchDetailTask = new CallableTask(this, "") {
+
+		private int searchResult;
+
+		public Object call() throws Exception {
+			searchResult = -1;
+			ManyList details = mDmo.getManyList("Details");
+			for (int i = 0; i < details.size(); i++) {
+				RpcObject item = details.get(i);
+				if (MatchDetail(item, detailSearchKey)) {
+					searchResult = i;
+					break;
+				}
+			}
+
+			Log.d("OrderEdit", String.format("订单明细搜索结果:%s", searchResult));
+
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		private boolean MatchDetail(RpcObject item, String detailSearchKey) {
+			String spell = item.getString("Goods_Spell");
+			if (spell.contains(detailSearchKey)) {
+				return true;
+			}
+			String code = item.getString("Goods_Code");
+			if (code.contains(detailSearchKey)) {
+				return true;
+			}
+			String goodsName = item.getString("Goods_Name");
+			if (goodsName.contains(detailSearchKey)) {
+				return true;
+			}
+			return false;
+		}
+
+		@Override
+		protected void successUI() {
+			if (searchResult >= 0) {
+				selectedPosition = searchResult;
+				firstVisiblePosition = searchResult;
+				applyToUI();
+			} else {
+				DialogUtil.AutoHiddenAlert(OrderEditActivity.this, "没有查找到匹配的明细");
+			}
+		}
+	};
+
+}
diff --git a/src/BWP/MobileSale/Order/OrderListActivity.java b/src/BWP/MobileSale/Order/OrderListActivity.java
new file mode 100644
index 0000000..0fa2e6c
--- /dev/null
+++ b/src/BWP/MobileSale/Order/OrderListActivity.java
@@ -0,0 +1,306 @@
+package BWP.MobileSale.Order;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.DialogUtil.SetDate;
+import BWP.MobileSale.Util.StringUtil;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.SimpleAdapter.ViewBinder;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+public class OrderListActivity extends LoginedActivity {
+
+	int pageCount = 0;
+	boolean flag = false;
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		// TODO Auto-generated method stub
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		switch(requestCode){
+		case OrderEditActivity.RequestCode_Open:
+			StartQuery(false);
+			break;
+		}
+	}
+
+	private int GetPageCount(){
+		String method = "/Sale/Sale/Rpcs/MobileOrderRpc/GetMobileOrderPageNum";
+		try{
+			RpcObject argument = SetArgument();
+			return RpcFacade.rpcCall(method,argument);
+		}catch(Exception e){
+					
+		}
+		return 0;
+	}
+
+	ViewBinder viewBinder = new ViewBinder() {
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.TextView_Date) {
+				((TextView)view).setText(DateTimeUtil.FormatDate((Date) data));
+				return true;
+			}
+			else{
+				return false;
+			}
+		}
+	};
+	
+	String[] columnNames = new String[]{"ID","Money","Buyer_Name","Date","BillState"};
+	
+	int[] columnIDs = new int[]{R.id.TextView1,R.id.TextView2,R.id.TextView3,R.id.TextView_Date,R.id.TextView_BillState};
+	
+	class SumInfo{
+		public int RowCount;
+		public BigDecimal Money;
+		@Override
+		public String toString() {
+			return String.format("共%s条记录,%s元",RowCount,Money);
+		}
+		
+	}
+	
+	SumInfo mSumInfo = new SumInfo();
+	int pageIndex = 1;
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/Search";
+			
+			if(flag == false){
+				pageCount = GetPageCount();
+			}
+			
+			Resources resource = getResources();
+			
+/*
+			String searchkey = (String) filter.getSelectedItem();
+			argument.setString("SearchKey", searchkey);
+	*/	
+			RpcObject argument = SetArgument();
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			mSumInfo.Money = new BigDecimal(0);
+			for(RpcObject row:rows){
+				mSumInfo.Money = mSumInfo.Money.add(row.getMoney("Money"));
+			}
+			adapter = new SimpleAdapter(OrderListActivity.this, rows,
+					R.layout.order_list_item, columnNames,columnIDs);
+			adapter.setViewBinder(viewBinder);
+			return null;
+			
+		}
+
+		
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+
+
+	};
+	
+	private RpcObject SetArgument() throws ParseException {
+		RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+		argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());
+		argument.setString("OrderBy", (String)orderByFilter.getSelectedItem());
+		String dateText = buttonDate.getText().toString();
+		String dateText2 = buttonEndDate.getText().toString();
+		if(!StringUtil.IsNullOrEmpty(dateText)){
+			Date parseDate = (Date) DateTimeUtil.ParseDate(dateText);
+			argument.setDate("Date1", parseDate);
+		}
+		if(!StringUtil.IsNullOrEmpty(dateText2)){
+			Date parseEndDate = (Date) DateTimeUtil.ParseDate(dateText2);
+			argument.setDate("Date2", parseEndDate);
+		}
+		argument.setInt("PageIndex", pageIndex);
+		return argument;
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "刷新");
+		menu.add(0,2,1,"统计");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Menu.FIRST:
+			StartQuery(false);
+			break;
+		case 2:
+			DialogUtil.Alert(this, mSumInfo.toString());
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.order_list);
+
+		initButtonReturn();
+
+		initListView();
+
+		initFilter();
+		
+		initButtonDate();
+		initButtonNextPage();
+		initButtonUpPage();
+		StartQuery(false);
+
+	}
+
+	private void initFilter() {
+		orderByFilter = (Spinner) findViewById(R.id.Spinner_OrderBy);
+		billStateFilter = (Spinner) findViewById(R.id.Spinner_BillStateFilter);
+		
+		OnItemSelectedListener listener = new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				pageIndex = 1;
+				StartQuery(false);
+				
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+				
+			}
+		};
+		
+		orderByFilter.setOnItemSelectedListener(listener);
+		billStateFilter.setOnItemSelectedListener(listener);
+		
+	}
+
+	private void initButtonReturn() {
+		ActivityUtil.FindButton(this, R.id.Button_Return)
+
+		.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View v) {
+				finish();
+			}
+		});
+	}
+	
+	private void initButtonNextPage() {
+		ActivityUtil.FindButton(this, R.id.Button_NextPage)
+		.setOnClickListener(new OnClickListener(){
+			public void onClick(View v) {
+				pageIndex++;
+				if(pageIndex >= pageCount){
+					return;
+				}
+				StartQuery(true);
+			}
+		});
+	}
+	
+	private void initButtonUpPage() {
+		ActivityUtil.FindButton(this, R.id.Button_UpPage)
+		.setOnClickListener(new OnClickListener(){
+			public void onClick(View v) {
+				
+				pageIndex--;
+				if(pageIndex <= 0){
+					return;
+				}
+				StartQuery(true);
+			}
+		});
+	}
+	private void initListView() {
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("ID", (Long) map.get("ID"));
+				intent.setClass(arg1.getContext(), OrderEditActivity.class);
+				startActivityForResult(intent,
+						OrderEditActivity.RequestCode_Open);
+			}
+
+		});
+	}
+
+	private void initButtonDate() {
+		buttonDate = ActivityUtil.FindButton(this, R.id.Button_Date);
+		DialogUtil.AddSelectDateDialog(buttonDate, new SetDate() {			
+
+			@Override
+			public void setDate(java.util.Date date) {
+				pageIndex = 1;
+				StartQuery(false);
+			}
+
+		});
+		buttonEndDate = ActivityUtil.FindButton(this, R.id.Button_EndDate);
+		DialogUtil.AddSelectDateDialog(buttonEndDate, new SetDate() {			
+
+			@Override
+			public void setDate(java.util.Date date) {
+				pageIndex = 1;
+				StartQuery(false);
+			}
+
+		});
+	}
+
+	private void StartQuery(boolean flag2) {
+		flag = flag2;
+		searchTask.execute();
+	}
+
+	ListView listView;
+	private SimpleAdapter adapter;
+	private Button buttonDate;
+	private Button buttonEndDate;
+
+	private Spinner filter;
+	private Spinner billStateFilter;
+	private Spinner orderByFilter;
+}
diff --git a/src/BWP/MobileSale/Order/OrderMainActivity.java b/src/BWP/MobileSale/Order/OrderMainActivity.java
new file mode 100644
index 0000000..1fe292b
--- /dev/null
+++ b/src/BWP/MobileSale/Order/OrderMainActivity.java
@@ -0,0 +1,48 @@
+package BWP.MobileSale.Order;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+
+public class OrderMainActivity extends LoginedActivity {
+
+
+
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.order_main);
+		
+		Button buttonOrderEdit = (Button)findViewById(R.id.Button_Main_OrderEdit);
+		buttonOrderEdit.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, OrderEditActivity.class);
+			}
+		});
+
+		
+		Button buttonOrderList = (Button)findViewById(R.id.Button_Main_OrderList);
+		buttonOrderList.setOnClickListener(new OnClickListener(){
+
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, OrderListActivity.class);
+			}
+			
+		});
+		
+		Button buttonUserSet = (Button)findViewById(R.id.Button_Main_OrderProfileSet);
+		buttonUserSet.setOnClickListener(new OnClickListener(){
+			
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, OrderSetUserProfileActivity.class);				
+			}
+			
+		});
+	}
+}
diff --git a/src/BWP/MobileSale/Order/OrderSetUserProfileActivity.java b/src/BWP/MobileSale/Order/OrderSetUserProfileActivity.java
new file mode 100644
index 0000000..6b80da3
--- /dev/null
+++ b/src/BWP/MobileSale/Order/OrderSetUserProfileActivity.java
@@ -0,0 +1,258 @@
+package BWP.MobileSale.Order;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Config.LoginUserConfig;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.ConfigUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+
+public class OrderSetUserProfileActivity extends LoginedActivity {
+
+	
+	Spinner spAccountUnit,systemSign,takeGoods_Type,saleType,orderFarePayer,orderCarriageManner;
+	private LoginUserConfig config = new LoginUserConfig(this);
+	private RpcObject mDmo;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.order_setuserprofile);
+		loadTask.execute();
+	}
+	
+	CallableTask loadTask = new CallableTask(OrderSetUserProfileActivity.this, "读取中...") 
+	{
+
+		@Override
+		public Object call() throws Exception {
+			ConfigUtil.Fill(config);
+			
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/LoadUserProfile";
+			mDmo = RpcFacade.rpcCall(method, config.Username);
+			if(mDmo==null)
+			{
+				mDmo=RpcObject.create("/Sale/Sale/BO/UserProfile");
+			}
+			//System.out.println(mDmo);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {			
+			try {
+				initControls();				
+			} catch (JsonRpcException e) {
+				DialogUtil.Alert(OrderSetUserProfileActivity.this, e.getDetailMessage());
+				e.printStackTrace();
+			}
+		}
+		
+	};
+	
+	private void initControls() throws JsonRpcException
+	{
+		initAccountUnit();
+		initSystemSign();
+		initTakeGoods_Type();
+		initSaleType();
+		initOrderFarePayer();
+		initOrderCarriageManner();
+		initButton();
+	}
+	
+	private void initOrderFarePayer() throws JsonRpcException
+	{
+		orderFarePayer = (Spinner)findViewById(R.id.order_setuser_setOrderFarePayer);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		list.add("购方");
+		list.add("供方");
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(OrderSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		orderFarePayer.setAdapter(adapter);
+		if(mDmo.getNamedValue("OrderFarePayer") != null){
+			if(mDmo.getNamedValue("OrderFarePayer").getValue() == 0){
+				orderFarePayer.setSelection(list.indexOf("购方")); 
+			}
+			if(mDmo.getNamedValue("OrderFarePayer").getValue() == 1){
+				orderFarePayer.setSelection(list.indexOf("供方")); 
+			}
+		}
+	}
+	
+	private void initOrderCarriageManner() throws JsonRpcException
+	{
+		orderCarriageManner = (Spinner)findViewById(R.id.order_setuser_setOrderCarriageManner);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		list.add("计重");
+		list.add("包车");
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(OrderSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		orderCarriageManner.setAdapter(adapter);
+		if(mDmo.getNamedValue("OrderCarriageManner") != null){
+			if(mDmo.getNamedValue("OrderCarriageManner").getValue() == 0){
+				orderCarriageManner.setSelection(list.indexOf("计重")); 
+			}
+			if(mDmo.getNamedValue("OrderCarriageManner").getValue() == 1){
+				orderCarriageManner.setSelection(list.indexOf("包车")); 
+			}
+		}
+	}
+
+	private void initButton()
+	{
+		Button btnReturn=(Button)findViewById(R.id.Order_SetUser_Ruturn);
+		btnReturn.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		
+		Button btnSave=(Button)findViewById(R.id.Order_SetUser_Save);
+		btnSave.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				saveTask.execute();
+				
+			}
+		});
+	}
+	
+	CallableTask saveTask = new CallableTask(OrderSetUserProfileActivity.this, "保存中...") 
+	{
+		@Override
+		public Object call() throws Exception {
+			
+			//UpdateUserProfile
+			mDmo.setString("AccountingUnit_Name", (String)spAccountUnit.getSelectedItem());
+			mDmo.setString("Order_SystemSign_Name", (String)systemSign.getSelectedItem());
+			String takeGoods_TypeString = (String)takeGoods_Type.getSelectedItem();
+			if(takeGoods_TypeString == "公司配送"){
+				mDmo.setNamedValue("TakeGoods_Type", new Short("0"));	
+			}else if(takeGoods_TypeString == "客户自运"){
+				mDmo.setNamedValue("TakeGoods_Type", new Short("1"));	
+			}else if(takeGoods_TypeString == "物流配送"){
+				mDmo.setNamedValue("TakeGoods_Type", new Short("2"));	
+			}
+			
+			//生成销售订单时用到【运费承担方】
+			String orderFarePayerString = (String)orderFarePayer.getSelectedItem();
+			if(orderFarePayerString == "购方"){
+				mDmo.setNamedValue("OrderFarePayer", new Short("0"));	
+			}else if(takeGoods_TypeString == "供方"){
+				mDmo.setNamedValue("OrderFarePayer", new Short("1"));	
+			}
+			
+			//生成销售订单时用到【运费结算方式】
+			String orderCarriageMannerString = (String)orderCarriageManner.getSelectedItem();
+			if(orderCarriageMannerString == "计重"){
+				mDmo.setNamedValue("OrderCarriageManner", new Short("0"));	
+			}else if(orderCarriageMannerString == "包车"){
+				mDmo.setNamedValue("OrderCarriageManner", new Short("1"));	
+			}
+			
+			mDmo.setString("OrderSaleType_Name", (String)saleType.getSelectedItem());
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/UpdateUserProfile";	
+			
+			RpcFacade.rpcCall(method,config.Username,mDmo);
+			
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(OrderSetUserProfileActivity.this, "保存成功");
+			finish();
+		}
+		
+	};
+	
+	
+	private void initAccountUnit() throws JsonRpcException
+	{
+		spAccountUnit=(Spinner)findViewById(R.id.order_setuser_setaccountunit);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadAccountingUnit";		
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}		
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(OrderSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		spAccountUnit.setAdapter(adapter);
+		spAccountUnit.setSelection(list.indexOf(mDmo.getString("AccountingUnit_Name")));
+	}
+	
+	private void initSystemSign() throws JsonRpcException
+	{
+		systemSign = (Spinner)findViewById(R.id.order_setuser_setSystemSign);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadSystemSign";		
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}		
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(OrderSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		systemSign.setAdapter(adapter);
+		systemSign.setSelection(list.indexOf(mDmo.getString("Order_SystemSign_Name")));
+	}
+	
+	private void initTakeGoods_Type() throws JsonRpcException
+	{
+		takeGoods_Type = (Spinner)findViewById(R.id.order_setuser_setTakeGoods_Type);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		list.add("公司配送");
+		list.add("客户自运");
+		list.add("物流配送");
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(OrderSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		takeGoods_Type.setAdapter(adapter);
+		if(mDmo.getNamedValue("TakeGoods_Type") != null){
+			if(mDmo.getNamedValue("TakeGoods_Type").getValue() == 0){
+				takeGoods_Type.setSelection(list.indexOf("公司配送")); 
+			}
+			if(mDmo.getNamedValue("TakeGoods_Type").getValue() == 1){
+				takeGoods_Type.setSelection(list.indexOf("客户自运")); 
+			}
+			if(mDmo.getNamedValue("TakeGoods_Type").getValue() == 2){
+				takeGoods_Type.setSelection(list.indexOf("物流配送")); 
+			}
+		}
+	}
+	
+	private void initSaleType() throws JsonRpcException
+	{
+		saleType = (Spinner)findViewById(R.id.order_setuser_setSaleType);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadSaleType";		
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}		
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(OrderSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		saleType.setAdapter(adapter);
+		saleType.setSelection(list.indexOf(mDmo.getString("OrderSaleType_Name")));
+	}
+	
+}
diff --git a/src/BWP/MobileSale/RemainGoods/RemainGoodsEditActivity.java b/src/BWP/MobileSale/RemainGoods/RemainGoodsEditActivity.java
new file mode 100644
index 0000000..18cad5b
--- /dev/null
+++ b/src/BWP/MobileSale/RemainGoods/RemainGoodsEditActivity.java
@@ -0,0 +1,667 @@
+package BWP.MobileSale.RemainGoods;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.ManyList;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.SelectBuyerActivity;
+import BWP.MobileSale.SelectGoodsActivity;
+import BWP.MobileSale.SelectRemarkActivity;
+import BWP.MobileSale.Config.LoginUserConfig; 
+import BWP.MobileSale.MobileAdjustGoodsBill.MobileAdjustGoodsBillDetailEditActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.OnPromptListener; 
+import BWP.MobileSale.Util.ViewOnClickTask;
+import BWP.widget.SelectSimpleAdapter;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle; 
+import android.text.InputType;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast; 
+
+public class RemainGoodsEditActivity extends LoginedActivity {
+	static final int RequestCode_SelectBuyer = 1;
+	static final int RequestCode_SelectGoods = 2;
+	static final int RequestCode_Open = 3; // 打开单据
+	static final int RequestCode_EditDetail = 4;
+	static final int RequestCode_SelectRemark = 5;
+	
+	private long mBillID;
+	private RpcObject mDmo;
+	private boolean mEnableSave = true;
+	boolean mEnableDelete = false;
+	boolean mEnableCheck = false;
+	boolean mEnableEditDate = false;
+	private TextView button_Date;
+	private TextView textViewRemark;
+	private ListView listView;
+	private TextView textView_BuyerName;
+	private TextView textViewDetailCount;
+	private TextView textViewDetailNum;
+	private int selectedPosition = -1;
+	private int firstVisiblePosition;
+	public static RpcObject EditingDetail;
+	private static final int Option_FindDetail = 0;
+
+	private static final int Option_ClearDetail = 1; 
+	private LoginUserConfig config = new LoginUserConfig(this);
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.remaingoods_edit);
+		Intent intent = getIntent();
+		mBillID = intent.getLongExtra("ID", 0);
+		initBillTask.execute();
+	 
+	}
+	
+	CallableTask initBillTask = new CallableTask(this, "读取单据中...") {
+		public Object call() throws Exception {
+		 
+			if (mBillID > 0) {
+				String method = "/Sale/SaleXiWang/Rpcs/RemainGoodsRpc/Load";
+				mDmo = RpcFacade.rpcCall(method, mBillID);
+				method = "/Sale/SaleXiWang/Rpcs/RemainGoodsRpc/EnableCheck";
+				mEnableCheck = RpcFacade.rpcCall(method, mBillID);
+			} else {
+				mDmo = RpcObject.create("/Sale/SaleXiWang/BO/RemainGoods");
+				mDmo.setDate("Date", new Date());
+			}			
+			String method2 = "/Sale/SaleXiWang/Rpcs/RemainGoodsRpc/CanEditDate";
+			mEnableEditDate = RpcFacade.rpcCall(method2);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			mEnableSave = mDmo.getNamedValue("BillState").getValue() == 0;
+			mEnableDelete = mDmo.getNamedValue("BillState").getValue() == 0;
+			initControls();
+			 applyToUI();
+		}
+
+	};
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+		super.onActivityResult(requestCode, resultCode, intent);
+		if (resultCode != Activity.RESULT_OK) {
+			return;
+		}
+		
+
+		switch (requestCode) {
+		case RequestCode_SelectBuyer: 
+			ReceiveSelectBuyerResult(intent);
+			break;
+		case RequestCode_SelectGoods:
+			ReceiveSelectGoodsResult(intent);
+			break;
+		case RequestCode_EditDetail:
+			ReceiveEditDetail(intent);
+			break; 
+		case RequestCode_SelectRemark:
+			ReceiveSelectRemarkResult(intent);
+			break;
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	private void ReceiveEditDetail(Intent intent) {
+		int position = intent.getIntExtra("Position", -1);
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Detail");
+		RpcObject detail = mDmo.getManyList("Details").get(position);
+		detail.setMoney("UnitNum", (BigDecimal) map.get("UnitNum"));
+		applyToUI();
+	}
+
+	
+	private void ReceiveSelectGoodsResult(Intent intent) {
+		firstVisiblePosition = listView.getBottom();
+		Object[] result = (Object[]) intent.getSerializableExtra("Result");
+		ManyList details = mDmo.getManyList("Details");
+		for (Object item : result) {
+			@SuppressWarnings("unchecked")
+			HashMap<String, Object> map = (HashMap<String, Object>) item;
+			try {
+				RpcObject detail = RpcObject.create("/Sale/SaleXiWang/BO/RemainGoods_Detail");
+				detail.setLong("Goods_ID", (Long) map.get("ID"));
+				detail.setString("Goods_Name", (String) map.get("Name"));
+				detail.setString("Goods_Code", (String) map.get("Code"));
+				detail.setString("Goods_Spell", (String) map.get("Spell"));
+				detail.setMoney("UnitNum", (BigDecimal) map.get("Number"));
+				detail.setMoney("Price", (BigDecimal) map.get("Price"));
+				details.add(detail);
+			} catch (JsonRpcException e) {
+				e.printStackTrace();
+			}
+		}
+		applyToUI();
+	}
+	
+	private void initControls() {
+		InitButtonReturn();
+
+		InitButtonSave();
+
+		InitButtonCheck();
+
+		 InitButtonDelete();
+
+		 InitListView();
+
+		 InitRemark();
+
+		 InitBuyer();
+
+		 InitDate();
+	}
+	
+	private void InitButtonCheck() {
+		Button btnCheck = ActivityUtil.FindButton(this, R.id.AdjustGoodsBill_Check);
+		if (!mEnableCheck) {
+			btnCheck.setVisibility(View.GONE);
+		}
+		btnCheck.setOnClickListener(checkTask);
+	}
+	
+	ViewOnClickTask checkTask = new ViewOnClickTask(this, "审核中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/SaleXiWang/Rpcs/RemainGoodsRpc/Check";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(RemainGoodsEditActivity.this, "审核成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(RemainGoodsEditActivity.this, RemainGoodsEditActivity.class);
+			startActivityIfNeeded(intent, RemainGoodsEditActivity.RequestCode_Open);
+
+		}
+	};
+	
+	private void InitButtonReturn() {
+		Button btnSave = ActivityUtil.FindButton(this, R.id.AdjustGoodsBill_Return);
+		btnSave.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+	}
+	
+	private void InitButtonSave() {
+		Button btnSave = ActivityUtil.FindButton(this, R.id.AdjustGoodsBill_Save);
+		if (!mEnableSave) {
+			btnSave.setVisibility(View.GONE);
+		}
+		btnSave.setOnClickListener(saveTask);
+	}
+	
+	ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") {
+		public Object call() throws Exception {
+			mDmo.setString("Remark", textViewRemark.getText().toString());
+			if (mBillID > 0) {
+				String method = "/Sale/SaleXiWang/Rpcs/RemainGoodsRpc/Update";
+				RpcFacade.rpcCall(method, mDmo);
+			} else {
+				String method = "/Sale/SaleXiWang/Rpcs/RemainGoodsRpc/Insert";
+				mBillID = RpcFacade.rpcCall(method, mDmo);
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+
+			Toast.makeText(getApplicationContext(), "保存成功", 1).show();
+
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(RemainGoodsEditActivity.this,
+					RemainGoodsEditActivity.class);
+			startActivityIfNeeded(intent,
+					RemainGoodsEditActivity.RequestCode_Open);
+
+		};
+	};
+	
+	private void InitListView() {
+		textViewDetailCount = ActivityUtil
+				.Find(this, R.id.AdjustGoodsBill_TextView_DetailCount);
+		textViewDetailNum=ActivityUtil.Find(this, R.id.AdjustGoodsBill_TextView_DetailNum);
+		listView = ActivityUtil.Find(this, R.id.Order_ListView);
+		Button selectGoods = ActivityUtil.Find(this, R.id.AdjustGoodsBill_Button_SelectGoods);
+		selectGoods.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				if(mDmo.getLong("Buyer_ID") == null){
+					Toast.makeText(getApplicationContext(), "请先选择购货客户！", 1).show();
+					return;
+				}
+				if(mDmo.getDate("Date") == null){
+					Toast.makeText(getApplicationContext(), "请先选择时间！", 1).show();
+					return;
+				}
+				Intent intent = new Intent();
+				intent.putExtra("Buyer_ID", mDmo.getLong("Buyer_ID"));
+				//intent.putExtra("AccountingUnit_ID", mDmo.getLong("AccountingUnit_ID"));
+				button_Date = (TextView)findViewById(R.id.AdjustGoodsBill_Button_Date);
+				intent.putExtra("Date", button_Date.getText());
+				intent.putExtra("IsOrNotShowSecond", false);
+				intent.setClass(arg0.getContext(), SelectGoodsActivity.class);
+				startActivityForResult(intent, RequestCode_SelectGoods);
+			}
+
+		});
+
+		if (!mEnableSave) {
+			selectGoods.setVisibility(View.GONE);
+			return;
+		}
+		listView.setOnItemLongClickListener(new OnItemLongClickListener() {
+
+			public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
+					final int arg2, long arg3) {
+				new AlertDialog.Builder(arg1.getContext()).setItems(
+						new CharSequence[] { "删除", "取消" },
+						new DialogInterface.OnClickListener() {
+
+							public void onClick(DialogInterface dialog,
+									int which) {
+								if (which == 0) {
+									selectedPosition = -1;
+									mDmo.getManyList("Details").remove(arg2);
+									applyToUI();
+								}
+							}
+
+						}).show();
+				
+				return true;
+			}
+
+		});
+
+		listView.setOnScrollListener(new OnScrollListener() {
+
+			public void onScroll(AbsListView arg0, int arg1, int arg2, int arg3) {
+				// TODO Auto-generated method stub
+
+			}
+
+			public void onScrollStateChanged(AbsListView arg0, int arg1) {
+				if (arg1 == OnScrollListener.SCROLL_STATE_IDLE) {
+					firstVisiblePosition = listView.getFirstVisiblePosition();
+				}
+
+			}
+
+		});
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+				
+			public void onItemClick(AdapterView<?> arg0, View arg1,
+					int position, long arg3) {
+				
+				if(button_Date.getText()==null || button_Date.getText() == ""){
+					Toast.makeText(getApplicationContext(), "请先选日期！", 1).show();
+				}
+				selectedPosition = position;
+				RpcObject result = mDmo.getManyList("Details").get(position);
+				EditingDetail = result;
+				Intent intent = new Intent();
+				intent.setClass(arg1.getContext(),
+						MobileAdjustGoodsBillDetailEditActivity.class);
+				HashMap<String, Object> map = new HashMap<String, Object>();
+				Iterator<Entry<String, Object>> iterator = result.entrySet()
+						.iterator();
+				while (iterator.hasNext()) {
+					Entry<String, Object> entry = iterator.next();
+					String cccString = entry.getKey();
+					if(cccString.equals("Goods_ConvertMode")){
+						continue;
+					}
+					map.put(entry.getKey(), entry.getValue());
+				}
+				intent.putExtra("Detail", map);
+				intent.putExtra("Position", position);
+				startActivityForResult(intent, RequestCode_EditDetail);
+
+			}
+
+		});
+	}
+	
+	private void InitDate() {
+		button_Date = ActivityUtil.Find(this, R.id.AdjustGoodsBill_Button_Date);
+		if (!mEnableSave) {
+			button_Date.setHint("");
+			return;
+		}
+		if(!mEnableEditDate){
+			button_Date.setEnabled(false);
+		}
+		button_Date.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				OnDateSetListener onDateSetListener = new DatePickerDialog.OnDateSetListener() {
+
+					public void onDateSet(DatePicker datePicker, int year,
+							int month, int day) {
+						Calendar calendar = Calendar.getInstance();
+						calendar.set(year, month, day);
+						Date date = DateTimeUtil.RemoveTime(calendar.getTime());
+						mDmo.setDate("Date", date);
+						applyToUI();
+					}
+
+				};
+				String dateStr = button_Date.getText().toString();
+				Calendar calendar = DateTimeUtil.SafeParseCalendar(dateStr);
+
+				new DatePickerDialog(arg0.getContext(), onDateSetListener,
+						calendar.get(Calendar.YEAR), calendar
+								.get(Calendar.MONTH), calendar
+								.get(Calendar.DAY_OF_MONTH)).show();
+
+			}
+
+		});
+	}
+	
+	private void InitBuyer() {
+		  
+		textView_BuyerName = ActivityUtil.Find(this, R.id.BuyerName);
+		Button searchInBuyerButton = ActivityUtil.FindButton(this,
+				R.id.SelectBuyer);
+		if (!mEnableSave) {
+			searchInBuyerButton.setVisibility(View.GONE);
+			return;
+		}
+		
+		searchInBuyerButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.setClass(arg0.getContext(), SelectBuyerActivity.class);
+				startActivityForResult(intent, RequestCode_SelectBuyer);
+			}
+
+		});
+	}
+	
+	private void InitRemark() {
+		if (mEnableSave) {
+			textViewRemark = ActivityUtil.Find(this, R.id.Order_EditText_Remark);
+			ActivityUtil.Find(this, R.id.Order_TextView_Remark).setVisibility(
+					View.GONE);
+
+			Button searchRemarkButton = ActivityUtil.FindButton(this,
+					R.id.Order_Button_SelectRemark);
+
+			searchRemarkButton.setOnClickListener(new OnClickListener() {
+
+				public void onClick(View arg0) {
+					Intent intent = new Intent();
+					intent.setClass(arg0.getContext(),
+							SelectRemarkActivity.class);
+					startActivityForResult(intent, RequestCode_SelectRemark);
+				}
+
+			});
+		} else {
+			textViewRemark = ActivityUtil.Find(this, R.id.Order_TextView_Remark);
+			ActivityUtil.Find(this, R.id.Order_EditText_Remark).setVisibility(
+					View.GONE);
+			ActivityUtil.FindButton(this, R.id.Order_Button_SelectRemark).setVisibility(
+					View.GONE);
+		}
+	}
+	
+	private void InitButtonDelete() {
+		deleteTask.setPrompt("确定要删除吗?");
+		Button buttonDelete = ActivityUtil.Find(this, R.id.AdjustGoodsBill_Delete);
+		if (!mEnableDelete) {
+			buttonDelete.setVisibility(View.GONE);
+		}
+		buttonDelete.setOnClickListener(deleteTask);
+	}
+	
+	ViewOnClickTask deleteTask = new ViewOnClickTask(this, "删除中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/SaleXiWang/Rpcs/RemainGoodsRpc/Delete";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.Alert(RemainGoodsEditActivity.this, "删除成功");
+			Intent intent = new Intent();
+			ActivityUtil.Finish(RemainGoodsEditActivity.this, intent);
+		}
+	};
+	
+	private void applyToUI() {
+		if (mDmo == null) {
+			DialogUtil.Alert(RemainGoodsEditActivity.this, "当前可编辑的对象为空");
+			finish();
+			return;
+		}
+
+		if (mBillID > 0) {
+			this.setTitle(String.format("%s-门店留货单No.%s(%s)",
+					getString(R.string.app_name), mBillID,
+					mDmo.getNamedValue("BillState")));
+		}
+
+		textView_BuyerName.setText(mDmo.getString("Buyer_Name"));
+		String aaString = mDmo.getString("Buyer_Name");
+		TextView aaTextView = (TextView)findViewById(R.id.BuyerName);
+		aaTextView.setText(aaString);
+
+		button_Date.setText(DateTimeUtil.FormatDate(mDmo.getDate("Date")));
+		textViewRemark.setText(mDmo.getString("Remark"));
+		ManyList details = mDmo.getManyList("Details");
+
+		BigDecimal allMoney = new BigDecimal(0);
+		BigDecimal allNum = new BigDecimal(0);
+		for (int i = 0; i < details.size(); i++) {
+			RpcObject item = details.get(i);
+			BigDecimal price = item.getMoney("Price");
+			if (price == null) {
+				price = new BigDecimal(0);
+			}
+			BigDecimal number = item.getMoney("UnitNum");
+			if (number == null) {
+				number = new BigDecimal(0);
+			}
+			allMoney = allMoney.add(price.multiply(number));
+			allNum=allNum.add(number);
+					
+		}
+
+		textViewDetailCount.setText(String.format("%s ￥%.2f", details.size(),
+				allMoney));
+		textViewDetailNum.setText(String.format("%s", allNum));
+
+		SelectSimpleAdapter adapter = new SelectSimpleAdapter(
+				RemainGoodsEditActivity.this, details,
+				R.layout.return_edit_detail_list_item, new String[] {
+						"Goods_Name", "UnitNum", "Price" }, new int[] {
+						R.id.Goods_Name, R.id.Number, R.id.Price });
+		adapter.setSelect(selectedPosition);
+		listView.setAdapter(adapter);
+		if (firstVisiblePosition == -1) {
+			firstVisiblePosition = details.size() - 1;
+		} else if (firstVisiblePosition > details.size() - 1) {
+			firstVisiblePosition = details.size() - 1;
+		}
+		listView.setSelection(firstVisiblePosition);
+	}
+	
+	@SuppressWarnings("unchecked")
+	private void ReceiveSelectBuyerResult(Intent intent) {
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Result");
+		mDmo.setString("Buyer_Name", (String) map.get("Name"));
+		mDmo.setLong("Buyer_ID", (Long) map.get("ID"));
+		applyToUI();
+	}
+	
+	private void ReceiveSelectRemarkResult(Intent intent) {
+		String Remark = (String) intent.getSerializableExtra("Result");
+		mDmo.setString("Remark", Remark);
+		applyToUI();
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Option_FindDetail, 0, "查找明细");
+		menu.add(0, Option_ClearDetail, 1, "清空明细");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	String detailSearchKey;
+	CallableTask searchDetailTask = new CallableTask(this, "") {
+
+		private int searchResult;
+
+		public Object call() throws Exception {
+			searchResult = -1;
+			ManyList details = mDmo.getManyList("Details");
+			for (int i = 0; i < details.size(); i++) {
+				RpcObject item = details.get(i);
+				if (MatchDetail(item, detailSearchKey)) {
+					searchResult = i;
+					break;
+				}
+			}
+
+			Log.d("OrderEdit", String.format("明细搜索结果:%s", searchResult));
+
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		private boolean MatchDetail(RpcObject item, String detailSearchKey) {
+			String spell = item.getString("Goods_Spell");
+			if (spell.contains(detailSearchKey)) {
+				return true;
+			}
+			String code = item.getString("Goods_Code");
+			if (code.contains(detailSearchKey)) {
+				return true;
+			}
+			String goodsName = item.getString("Goods_Name");
+			if (goodsName.contains(detailSearchKey)) {
+				return true;
+			}
+			return false;
+		}
+
+		@Override
+		protected void successUI() {
+			if (searchResult >= 0) {
+				selectedPosition = searchResult;
+				firstVisiblePosition = searchResult;
+				applyToUI();
+			} else {
+				DialogUtil
+						.AutoHiddenAlert(RemainGoodsEditActivity.this, "没有查找到匹配的明细");
+			}
+		}
+	};
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Option_FindDetail:
+			DialogUtil.Prompt(RemainGoodsEditActivity.this, "存货明细查找", "支持名称编码拼音首字母",
+					"", InputType.TYPE_CLASS_TEXT, new OnPromptListener() {
+						public void OnPrompt(String prompt) {
+							detailSearchKey = prompt;
+							searchDetailTask.execute();
+						}
+
+						@Override
+						public void OnPrompt2(HashMap<String, Object> prompt) {
+							// TODO Auto-generated method stub
+							
+						}
+					});
+			break;
+		case Option_ClearDetail:
+			DialogUtil.Confirm(RemainGoodsEditActivity.this, "确定要清空明细吗?", "是", "否",
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							selectedPosition = -1;
+							mDmo.getManyList("Details").clear();
+							applyToUI();
+						}
+					});
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		switch(keyCode){
+		case KeyEvent.KEYCODE_BACK:
+			DialogUtil.Confirm(this, "您按了返回按钮,是否返回?", "是","否", new android.content.DialogInterface.OnClickListener(){
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					finish();
+				}
+				
+			});
+			return false;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+ }
+
diff --git a/src/BWP/MobileSale/RemainGoods/RemainGoodsListActivity.java b/src/BWP/MobileSale/RemainGoods/RemainGoodsListActivity.java
new file mode 100644
index 0000000..8a75e99
--- /dev/null
+++ b/src/BWP/MobileSale/RemainGoods/RemainGoodsListActivity.java
@@ -0,0 +1,220 @@
+package BWP.MobileSale.RemainGoods;
+import java.math.BigDecimal; 
+import java.util.Date;
+import java.util.HashMap; 
+import java.util.List; 
+
+
+import org.forks.jsonrpc.DFDataTable; 
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R; 
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil; 
+import BWP.MobileSale.Util.StringUtil; 
+import BWP.MobileSale.Util.DialogUtil.SetDate;  
+import android.content.Intent; 
+import android.os.Bundle; 
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener; 
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener; 
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.SimpleAdapter.ViewBinder;
+import android.widget.Button; 
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.Spinner;
+import android.widget.TextView; 
+
+public class RemainGoodsListActivity extends LoginedActivity {
+	ListView listView;
+	private SimpleAdapter adapter;
+	private Button buttonDate;
+	private Button btnRefresh;
+
+	private Spinner filter;
+	private Spinner billStateFilter;
+	
+	
+	String[] columnNames = new String[]{"ID","Money","Buyer_Name","Date","BillState"};
+	
+	int[] columnIDs = new int[]{R.id.TextView1,R.id.TextView2,R.id.TextView3,R.id.TextView_Date,R.id.TextView_BillState};
+	
+	
+	class SumInfo{
+		public int RowCount;
+		public BigDecimal Money;
+		@Override
+		public String toString() {
+			return String.format("共%s条记录,%s元",RowCount,Money);
+		}
+		
+	}
+	
+	SumInfo mSumInfo = new SumInfo();
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/SaleXiWang/Rpcs/RemainGoodsRpc/Search";
+			RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+			 
+			String searchkey = (String) filter.getSelectedItem();
+			argument.setString("SearchKey", searchkey);
+		
+			argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());
+			
+			String dateText = buttonDate.getText().toString();
+			if(!StringUtil.IsNullOrEmpty(dateText)){
+				Date parseDate = DateTimeUtil.ParseDate(dateText);
+				argument.setDate("Date1", parseDate);
+			}
+			
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			mSumInfo.RowCount = rows.size();
+			mSumInfo.Money = new BigDecimal(0);
+			for(RpcObject row:rows){
+				mSumInfo.Money = mSumInfo.Money.add(row.getMoney("Money"));
+			}
+			
+			
+			adapter = new SimpleAdapter(RemainGoodsListActivity.this, rows,
+					R.layout.order_list_item, columnNames,columnIDs);
+			adapter.setViewBinder(viewBinder);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+
+
+	};
+	ViewBinder viewBinder = new ViewBinder() {
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.TextView_Date) {
+				((TextView)view).setText(DateTimeUtil.FormatDate((Date) data));
+				return true;
+			}
+			else{
+				return false;
+			}
+		}
+	};
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.remaingoods_list);
+		initButtonRefresh();
+		
+		initListView();
+
+		initFilter();
+		
+		initButtonDate();
+
+		StartQuery();
+	}
+	
+	private void initButtonRefresh()
+	{
+		btnRefresh=(Button)findViewById(R.id.Button_Refresh);
+		btnRefresh.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				StartQuery();
+			}
+		});
+		
+	}
+	
+	
+	private void StartQuery() {
+		searchTask.execute();
+	}
+	
+	private void initButtonDate() {
+		buttonDate = ActivityUtil.FindButton(this, R.id.Button_Date);
+		DialogUtil.AddSelectDateDialog(buttonDate, new SetDate() {
+
+			public void setDate(Date date) {
+				StartQuery();
+			}
+
+		});
+	}
+	
+	private void initFilter() {
+		filter = ActivityUtil.Find(this, R.id.Spinner_Filter);
+		billStateFilter = (Spinner) findViewById(R.id.Spinner_BillStateFilter);
+		
+		OnItemSelectedListener listener = new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				StartQuery();
+				
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+				
+			}
+		};
+		
+		filter.setOnItemSelectedListener(listener);
+		billStateFilter.setOnItemSelectedListener(listener);
+		
+	}
+	
+	private void initListView() {
+		listView = ActivityUtil.Find(this, R.id.ListView);
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("ID", (Long) map.get("ID"));
+				intent.setClass(arg1.getContext(), RemainGoodsEditActivity.class);
+				startActivityForResult(intent,RemainGoodsEditActivity.RequestCode_Open);
+			}
+
+		});
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "刷新");
+		menu.add(0,2,1,"统计");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Menu.FIRST:
+			StartQuery();
+			break;
+		case 2:
+			DialogUtil.Alert(this, mSumInfo.toString());
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+ }
+
diff --git a/src/BWP/MobileSale/RemainGoods/RemainGoodsMainActivity.java b/src/BWP/MobileSale/RemainGoods/RemainGoodsMainActivity.java
new file mode 100644
index 0000000..75ed92f
--- /dev/null
+++ b/src/BWP/MobileSale/RemainGoods/RemainGoodsMainActivity.java
@@ -0,0 +1,40 @@
+ 
+package BWP.MobileSale.RemainGoods;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+ 
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+
+public class RemainGoodsMainActivity extends LoginedActivity {
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.remaingoods_main);
+		
+		Button buttonEdit = (Button)findViewById(R.id.Button_Main_RemainGoodsEdit);
+		buttonEdit.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, RemainGoodsEditActivity.class);
+			}
+		});
+		
+		Button buttonList = (Button)findViewById(R.id.Button_Main_RemainGoodsList);
+		buttonList.setOnClickListener(new OnClickListener(){
+
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, RemainGoodsListActivity.class);				
+			}
+			
+		});
+		
+ 
+	}
+}
\ No newline at end of file
diff --git a/src/BWP/MobileSale/Return/ReturnDetailEditActivity.java b/src/BWP/MobileSale/Return/ReturnDetailEditActivity.java
new file mode 100644
index 0000000..4e48c04
--- /dev/null
+++ b/src/BWP/MobileSale/Return/ReturnDetailEditActivity.java
@@ -0,0 +1,60 @@
+package BWP.MobileSale.Return;
+
+import java.util.HashMap;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Order.OrderDetailEditActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.StringUtil;
+
+public class ReturnDetailEditActivity extends LoginedActivity {
+	private TextView textViewGoodsName;
+	private EditText editTextNumber;
+	private int position;
+	//private HashMap<String,Object> detail;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.return_detail_edit);
+		//GoodsDetails
+		
+		Intent intent = getIntent();
+		position = intent.getIntExtra("Position", -1);
+		//detail = (HashMap<String, Object>) intent.getSerializableExtra("GoodsDetails");
+		
+		
+		textViewGoodsName = ActivityUtil.Find(this, R.id.TextView_Goods_Name);
+		editTextNumber = ActivityUtil.Find(this, R.id.EditText_Number);
+		
+		textViewGoodsName.setText(StringUtil.ToString(intent.getStringExtra("Goods_Name")));
+		editTextNumber.setText(StringUtil.ToString(intent.getStringExtra("UnitNum")));
+		Button buttonOK = ActivityUtil.Find(this, R.id.Button_OK);
+		Button buttonCancel = ActivityUtil.Find(this, R.id.Button_Cancel);
+		buttonOK.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View v) {
+			
+				Intent intent =new Intent();
+				intent.putExtra("UnitNum", editTextNumber.getText().toString());				
+				intent.putExtra("Position", position);
+				ActivityUtil.Finish(ReturnDetailEditActivity.this, intent);				
+			}
+		});
+		
+		buttonCancel.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View v) {
+				finish();				
+			}
+		});
+		
+	}
+}
diff --git a/src/BWP/MobileSale/Return/ReturnEditActivity.java b/src/BWP/MobileSale/Return/ReturnEditActivity.java
new file mode 100644
index 0000000..00ac654
--- /dev/null
+++ b/src/BWP/MobileSale/Return/ReturnEditActivity.java
@@ -0,0 +1,685 @@
+package BWP.MobileSale.Return;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+
+
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.ManyList;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.SelectBuyerActivity;
+import BWP.MobileSale.SelectRemarkActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.OnPromptListener;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import BWP.widget.SelectSimpleAdapter;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.InputType;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.ListView;
+import android.widget.TextView;
+
+public class ReturnEditActivity extends LoginedActivity {
+
+	static final int RequestCode_SelectBuyer = 1;
+	static final int RequestCode_SelectGoods = 2;
+	static final int RequestCode_Open = 3; // 打开单据
+	static final int RequestCode_EditDetail = 4;
+	static final int RequestCode_SelectRemark = 5;
+	static final int RequestCode_SelectSaleOutStore=6;
+
+	private long mBillID;
+	private RpcObject mDmo;
+	private boolean mEnableSave = true;
+	boolean mEnableDelete = false;
+	boolean mEnableCheck = false;
+	private TextView button_Date;
+	private TextView textViewRemark;
+	private ListView listView;
+	private TextView textView_BuyerName;
+	private TextView textView_SaleOutStore;
+	private Button button_SaleOutStore;
+	private TextView textViewDetailCount;
+	private TextView textViewDetailNum;
+	private int selectedPosition = -1;
+	private int firstVisiblePosition;
+	public static RpcObject EditingDetail;
+	
+	private static final int Option_FindDetail = 0;
+
+	private static final int Option_ClearDetail = 1;
+	
+	
+	CallableTask initBillTask = new CallableTask(this, "读取单据中...") {
+		public Object call() throws Exception {
+			if (mBillID > 0) {
+				String method = "/Sale/Returns/Rpcs/MobileReturnRpc/Load";
+				mDmo = RpcFacade.rpcCall(method, mBillID);
+
+				method = "/Sale/Returns/Rpcs/MobileReturnRpc/EnableCheck";
+				mEnableCheck = RpcFacade.rpcCall(method, mBillID);
+
+			} else {
+				mDmo = RpcObject.create("/Sale/Returns/BO/ReturnsRecord");
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			mEnableSave = mDmo.getNamedValue("BillState").getValue() == 0;
+			mEnableDelete = mDmo.getNamedValue("BillState").getValue() == 0;
+			initControls();
+			 applyToUI();
+		}
+
+	};
+	
+	private void applyToUI() {
+		if (mDmo == null) {
+			DialogUtil.Alert(ReturnEditActivity.this, "当前可编辑的对象为空");
+			finish();
+			return;
+		}
+
+		if (mBillID > 0) {
+			this.setTitle(String.format("%s-退货登记单No.%s(%s)",
+					getString(R.string.app_name), mBillID,
+					mDmo.getNamedValue("BillState")));
+		}
+
+		textView_BuyerName.setText(mDmo.getString("Buyer_Name"));
+
+		button_Date.setText(DateTimeUtil.FormatDate(mDmo.getDate("ReturnsTime")));
+		textViewRemark.setText(mDmo.getString("Remark"));
+		ManyList details = mDmo.getManyList("GoodsDetails");
+
+		BigDecimal allMoney = new BigDecimal(0);
+		BigDecimal allNum = new BigDecimal(0);
+		for (int i = 0; i < details.size(); i++) {
+			RpcObject item = details.get(i);
+			BigDecimal price = item.getMoney("Price");
+			if (price == null) {
+				price = new BigDecimal(0);
+			}
+			BigDecimal number = item.getMoney("UnitNum");
+			if (number == null) {
+				number = new BigDecimal(0);
+			}
+			allMoney = allMoney.add(price.multiply(number));
+			allNum=allNum.add(number);
+					
+		}
+
+		textViewDetailCount.setText(String.format("%s ￥%.2f", details.size(),
+				allMoney));
+		textViewDetailNum.setText(String.format("%s", allNum));
+
+		SelectSimpleAdapter adapter = new SelectSimpleAdapter(
+				ReturnEditActivity.this, details,
+				R.layout.return_edit_detail_list_item, new String[] {
+						"Goods_Name", "UnitNum", "Price" }, new int[] {
+						R.id.Goods_Name, R.id.Number, R.id.Price });
+		adapter.setSelect(selectedPosition);
+		listView.setAdapter(adapter);
+		if (firstVisiblePosition == -1) {
+			firstVisiblePosition = details.size() - 1;
+		} else if (firstVisiblePosition > details.size() - 1) {
+			firstVisiblePosition = details.size() - 1;
+		}
+		listView.setSelection(firstVisiblePosition);
+	}
+	
+
+	private void initControls() {
+		// InitButtonReturn();
+
+		InitButtonSave();
+
+		InitButtonCheck();
+
+		 InitButtonDelete();
+
+		 InitListView();
+
+		 InitRemark();
+
+		 InitBuyer();
+
+		 InitDate();
+		 initSaleOutStore();
+	}
+	private void InitListView() {
+		textViewDetailCount = ActivityUtil
+				.Find(this, R.id.Return_TextView_DetailCount);
+		textViewDetailNum=ActivityUtil.Find(this, R.id.Return_TextView_DetailNum);
+		listView = ActivityUtil.Find(this, R.id.Return_ListView);
+		Button selectGoods = ActivityUtil.Find(this, R.id.Return_Button_SelectGoods);
+		selectGoods.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.setClass(arg0.getContext(), ReturnSelectGoodsActivity.class);
+				startActivityForResult(intent, RequestCode_SelectGoods);
+			}
+
+		});
+
+		if (!mEnableSave) {
+			selectGoods.setVisibility(View.GONE);
+			return;
+		}
+		listView.setOnItemLongClickListener(new OnItemLongClickListener() {
+
+			public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
+					final int arg2, long arg3) {
+				new AlertDialog.Builder(arg1.getContext()).setItems(
+						new CharSequence[] { "删除", "取消" },
+						new DialogInterface.OnClickListener() {
+
+							public void onClick(DialogInterface dialog,
+									int which) {
+								if (which == 0) {
+									selectedPosition = -1;
+									mDmo.getManyList("GoodsDetails").remove(arg2);
+									applyToUI();
+								}
+							}
+
+						}).show();
+
+				return true;
+			}
+
+		});
+
+		listView.setOnScrollListener(new OnScrollListener() {
+
+			public void onScroll(AbsListView arg0, int arg1, int arg2, int arg3) {
+				// TODO Auto-generated method stub
+
+			}
+
+			public void onScrollStateChanged(AbsListView arg0, int arg1) {
+				if (arg1 == OnScrollListener.SCROLL_STATE_IDLE) {
+					firstVisiblePosition = listView.getFirstVisiblePosition();
+				}
+
+			}
+
+		});
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+				
+			public void onItemClick(AdapterView<?> arg0, View arg1,
+					int position, long arg3) {
+				
+				//System.out.println("运行到我啦");
+				
+				selectedPosition = position;
+				RpcObject result = mDmo.getManyList("GoodsDetails").get(position);
+				EditingDetail = result;
+				Intent intent = new Intent();
+				intent.setClass(arg1.getContext(),ReturnDetailEditActivity.class);
+				intent.putExtra("Position", position);
+
+				
+				intent.putExtra("Goods_Name", result.getString("Goods_Name"));
+				intent.putExtra("UnitNum",StringUtil.ToString(result.getMoney("UnitNum")));
+				startActivityForResult(intent, RequestCode_EditDetail);
+
+			}
+
+		});
+	}
+
+	private void initSaleOutStore()
+	{
+		textView_SaleOutStore=(TextView)findViewById(R.id.Return_TextView_SaleOutStore);
+		button_SaleOutStore=(Button)findViewById(R.id.Return_Button_SaleOutStore);
+		button_SaleOutStore.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				if(mDmo.getLong("Buyer_ID")==null)
+				{
+					new AlertDialog.Builder(ReturnEditActivity.this).setNegativeButton("先选择购货客户", new DialogInterface.OnClickListener() {
+						
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							//finish();
+						}
+					}).setTitle("错误信息").create().show();
+					return;
+				}
+				Intent intent=new Intent();	
+				intent.putExtra("Buyer_ID", mDmo.getLong("Buyer_ID"));
+				intent.setClass(ReturnEditActivity.this, SelectSaleOutStoreActivity.class);
+				startActivityForResult(intent, RequestCode_SelectSaleOutStore);
+				
+			}
+		});
+	}
+	
+	private void InitDate() {
+		button_Date = ActivityUtil.Find(this, R.id.Return_Button_Date);
+		if (!mEnableSave) {
+			button_Date.setHint("");
+			return;
+		}
+		button_Date.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				OnDateSetListener onDateSetListener = new DatePickerDialog.OnDateSetListener() {
+
+					public void onDateSet(DatePicker datePicker, int year,
+							int month, int day) {
+						Calendar calendar = Calendar.getInstance();
+						calendar.set(year, month, day);
+						Date date = DateTimeUtil.RemoveTime(calendar.getTime());
+						mDmo.setDate("ReturnsTime", date);
+						applyToUI();
+					}
+
+				};
+				String dateStr = button_Date.getText().toString();
+				Calendar calendar = DateTimeUtil.SafeParseCalendar(dateStr);
+
+				new DatePickerDialog(arg0.getContext(), onDateSetListener,
+						calendar.get(Calendar.YEAR), calendar
+								.get(Calendar.MONTH), calendar
+								.get(Calendar.DAY_OF_MONTH)).show();
+
+			}
+
+		});
+	}
+	private void InitBuyer() {
+		textView_BuyerName = ActivityUtil.Find(this, R.id.Return_TextView_BuyerName);
+		Button searchBuyerButton = ActivityUtil.FindButton(this,
+				R.id.Return_Button_SelectBuyer);
+		if (!mEnableSave) {
+			searchBuyerButton.setVisibility(View.GONE);
+			return;
+		}
+
+		searchBuyerButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.setClass(arg0.getContext(), SelectBuyerActivity.class);
+				startActivityForResult(intent, RequestCode_SelectBuyer);
+			}
+
+		});
+	}
+	private void InitRemark() {
+		if (mEnableSave) {
+			textViewRemark = ActivityUtil.Find(this, R.id.Return_EditText_Remark);
+			ActivityUtil.Find(this, R.id.Return_TextView_Remark).setVisibility(
+					View.GONE);
+
+			Button searchRemarkButton = ActivityUtil.FindButton(this,
+					R.id.Return_Button_SelectRemark);
+
+			searchRemarkButton.setOnClickListener(new OnClickListener() {
+
+				public void onClick(View arg0) {
+					Intent intent = new Intent();
+					intent.setClass(arg0.getContext(),
+							SelectRemarkActivity.class);
+					startActivityForResult(intent, RequestCode_SelectRemark);
+				}
+
+			});
+		} else {
+			textViewRemark = ActivityUtil.Find(this, R.id.Return_TextView_Remark);
+			ActivityUtil.Find(this, R.id.Return_EditText_Remark).setVisibility(
+					View.GONE);
+			ActivityUtil.FindButton(this, R.id.Return_Button_SelectRemark).setVisibility(
+					View.GONE);
+		}
+	}
+	private void InitButtonDelete() {
+		deleteTask.setPrompt("确定要删除吗?");
+		Button buttonDelete = ActivityUtil.Find(this, R.id.Return_Button_Delete);
+		if (!mEnableDelete) {
+			buttonDelete.setVisibility(View.GONE);
+		}
+		buttonDelete.setOnClickListener(deleteTask);
+	}
+
+	ViewOnClickTask deleteTask = new ViewOnClickTask(this, "删除中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Returns/Rpcs/MobileReturnRpc/Delete";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.Alert(ReturnEditActivity.this, "删除成功");
+			Intent intent = new Intent();
+			ActivityUtil.Finish(ReturnEditActivity.this, intent);
+
+		}
+	};
+	
+	private void InitButtonCheck() {
+		Button btnCheck = ActivityUtil.FindButton(this, R.id.Return_Button_Check);
+		if (!mEnableCheck) {
+			btnCheck.setVisibility(View.GONE);
+		}
+		btnCheck.setOnClickListener(checkTask);
+	}
+	ViewOnClickTask checkTask = new ViewOnClickTask(this, "审核中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Returns/Rpcs/MobileReturnRpc/Check";
+			RpcFacade.rpcCall(method, mBillID);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(ReturnEditActivity.this, "审核成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(ReturnEditActivity.this, ReturnEditActivity.class);
+			startActivityIfNeeded(intent, ReturnEditActivity.RequestCode_Open);
+
+		}
+	};
+	private void InitButtonSave() {
+		Button btnSave = ActivityUtil.FindButton(this, R.id.Return_Button_Save);
+		if (!mEnableSave) {
+			btnSave.setVisibility(View.GONE);
+		}
+		btnSave.setOnClickListener(saveTask);
+	}
+
+	ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") {
+		public Object call() throws Exception {
+			mDmo.setString("Remark", textViewRemark.getText().toString());
+			if (mBillID > 0) {
+				String method = "/Sale/Returns/Rpcs/MobileReturnRpc/Update";
+				RpcFacade.rpcCall(method, mDmo);
+			} else {
+				String method = "/Sale/Returns/Rpcs/MobileReturnRpc/Insert";
+				mBillID = RpcFacade.rpcCall(method, mDmo);
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(ReturnEditActivity.this, "保存成功");
+			finish();
+			Intent intent = new Intent();
+			intent.putExtra("ID", mBillID);
+			intent.setClass(ReturnEditActivity.this, ReturnEditActivity.class);
+			startActivityIfNeeded(intent, ReturnEditActivity.RequestCode_Open);
+		}
+
+	};
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.return_edit);
+		Intent intent = getIntent();
+		mBillID = intent.getLongExtra("ID", 0);
+		initBillTask.execute();
+	}
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+		super.onActivityResult(requestCode, resultCode, intent);
+		if (resultCode != Activity.RESULT_OK) {
+			return;
+		}
+		
+
+		switch (requestCode) {
+		case RequestCode_SelectBuyer:
+			ReceiveSelectBuyerResult(intent);
+			break;
+		case RequestCode_SelectGoods:
+			ReceiveSelectGoodsResult(intent);
+			break;
+		case RequestCode_EditDetail:
+			ReceiveEditDetail(intent);
+			break;
+		case RequestCode_SelectRemark:
+			ReceiveSelectRemarkResult(intent);
+			break;
+		case RequestCode_SelectSaleOutStore:
+			ReceiveSelectSaleOutStore(intent);
+			break;
+
+		}
+	}
+	
+	private void ReceiveSelectSaleOutStore(Intent intent)
+	{
+		firstVisiblePosition = listView.getBottom();
+		Object[] result = (Object[]) intent.getSerializableExtra("Result");
+		ManyList details = mDmo.getManyList("GoodsDetails");
+		for (Object item : result) {
+			@SuppressWarnings("unchecked")
+			HashMap<String, Object> map = (HashMap<String, Object>) item;
+			try {
+				RpcObject detail = RpcObject.create("/Sale/Returns/BO/ReturnsRecord_GoodsDetails");
+				detail.setLong("Goods_ID", (Long) map.get("Goods_ID"));
+				detail.setString("Goods_Name", (String) map.get("Goods_Name"));
+				detail.setString("Goods_Code", (String) map.get("Goods_Code"));
+				detail.setString("Goods_Spell", (String) map.get("Goods_Spell"));
+				//detail.setMoney("UnitNum", (BigDecimal) map.get("UnitNum"));
+				detail.setMoney("Price", (BigDecimal) map.get("Price"));
+				long saleid=(Long)map.get("SaleOutStore_ID");
+				Date saledate=(Date)map.get("LoadTime");				
+				String saleiddate=saleid+"/"+DateTimeUtil.FormatDate(saledate);
+				System.out.println(saleiddate);
+				
+				detail.setString("SaleOutStore_ID", saleiddate);
+//				Short temp=(Short)map.get("ReturnsManner");
+//				detail.setNamedValue("ReturnsManner", temp);				
+				
+				details.add(detail);
+			} catch (JsonRpcException e) {
+				e.printStackTrace();
+			}
+		}
+		applyToUI();
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	private void ReceiveEditDetail(Intent intent) {
+		int position = intent.getIntExtra("Position", -1);
+		
+		RpcObject detail = mDmo.getManyList("GoodsDetails").get(position);
+		//HashMap<String, Object> map = (HashMap<String, Object>) intent.getSerializableExtra("GoodsDetails");
+		
+		detail.setMoney("UnitNum",StringUtil.ParseMoney(intent.getStringExtra("UnitNum")));		
+		applyToUI();
+	}
+
+	private void ReceiveSelectGoodsResult(Intent intent) {
+		firstVisiblePosition = listView.getBottom();
+		Object[] result = (Object[]) intent.getSerializableExtra("Result");
+		ManyList details = mDmo.getManyList("GoodsDetails");
+		for (Object item : result) {
+			@SuppressWarnings("unchecked")
+			HashMap<String, Object> map = (HashMap<String, Object>) item;
+			try {
+				RpcObject detail = RpcObject.create("/Sale/Returns/BO/ReturnsRecord_GoodsDetails");
+				detail.setLong("Goods_ID", (Long) map.get("ID"));
+				detail.setString("Goods_Name", (String) map.get("Name"));
+				detail.setString("Goods_Code", (String) map.get("Code"));
+				detail.setString("Goods_Spell", (String) map.get("Spell"));
+				detail.setMoney("UnitNum", (BigDecimal) map.get("UnitNum"));
+				detail.setMoney("Price", (BigDecimal) map.get("Price"));
+				
+				Short temp=(Short)map.get("ReturnsManner");
+				detail.setNamedValue("ReturnsManner", temp);				
+				
+				details.add(detail);
+			} catch (JsonRpcException e) {
+				e.printStackTrace();
+			}
+		}
+		applyToUI();
+	}
+	@SuppressWarnings("unchecked")
+	private void ReceiveSelectBuyerResult(Intent intent) {
+		HashMap<String, Object> map = (HashMap<String, Object>) intent
+				.getSerializableExtra("Result");
+		mDmo.setString("Buyer_Name", (String) map.get("Name"));
+		mDmo.setLong("Buyer_ID", (Long) map.get("ID"));
+		applyToUI();
+	}
+
+	private void ReceiveSelectRemarkResult(Intent intent) {
+		String Remark = (String) intent.getSerializableExtra("Result");
+		mDmo.setString("Remark", Remark);
+		applyToUI();
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Option_FindDetail, 0, "查找明细");
+		menu.add(0, Option_ClearDetail, 1, "清空明细");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	String detailSearchKey;
+	CallableTask searchDetailTask = new CallableTask(this, "") {
+
+		private int searchResult;
+
+		public Object call() throws Exception {
+			searchResult = -1;
+			ManyList details = mDmo.getManyList("GoodsDetails");
+			for (int i = 0; i < details.size(); i++) {
+				RpcObject item = details.get(i);
+				if (MatchDetail(item, detailSearchKey)) {
+					searchResult = i;
+					break;
+				}
+			}
+
+			Log.d("OrderEdit", String.format("退货登记单明细搜索结果:%s", searchResult));
+
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		private boolean MatchDetail(RpcObject item, String detailSearchKey) {
+			String spell = item.getString("Goods_Spell");
+			if (spell.contains(detailSearchKey)) {
+				return true;
+			}
+			String code = item.getString("Goods_Code");
+			if (code.contains(detailSearchKey)) {
+				return true;
+			}
+			String goodsName = item.getString("Goods_Name");
+			if (goodsName.contains(detailSearchKey)) {
+				return true;
+			}
+			return false;
+		}
+
+		@Override
+		protected void successUI() {
+			if (searchResult >= 0) {
+				selectedPosition = searchResult;
+				firstVisiblePosition = searchResult;
+				applyToUI();
+			} else {
+				DialogUtil
+						.AutoHiddenAlert(ReturnEditActivity.this, "没有查找到匹配的明细");
+			}
+		}
+	};
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Option_FindDetail:
+			DialogUtil.Prompt(ReturnEditActivity.this, "存货明细查找", "支持名称编码拼音首字母",
+					"", InputType.TYPE_CLASS_TEXT, new OnPromptListener() {
+						public void OnPrompt(String prompt) {
+							detailSearchKey = prompt;
+							searchDetailTask.execute();
+						}
+
+						@Override
+						public void OnPrompt2(HashMap<String, Object> prompt) {
+							// TODO Auto-generated method stub
+							
+						}
+					});
+			break;
+		case Option_ClearDetail:
+			DialogUtil.Confirm(ReturnEditActivity.this, "确定要清空明细吗?", "是", "否",
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							selectedPosition = -1;
+							mDmo.getManyList("GoodsDetails").clear();
+							applyToUI();
+						}
+					});
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		switch(keyCode){
+		case KeyEvent.KEYCODE_BACK:
+			DialogUtil.Confirm(this, "您按了返回按钮,是否返回?", "是","否", new android.content.DialogInterface.OnClickListener(){
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					finish();
+				}
+				
+			});
+			return false;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+
+}
diff --git a/src/BWP/MobileSale/Return/ReturnListActivity.java b/src/BWP/MobileSale/Return/ReturnListActivity.java
new file mode 100644
index 0000000..b9f6643
--- /dev/null
+++ b/src/BWP/MobileSale/Return/ReturnListActivity.java
@@ -0,0 +1,225 @@
+package BWP.MobileSale.Return;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.DialogUtil.SetDate;
+import BWP.MobileSale.Util.StringUtil;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.SimpleAdapter.ViewBinder;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+public class ReturnListActivity  extends LoginedActivity {
+
+	
+	ListView listView;
+	private SimpleAdapter adapter;
+	private Button buttonDate;
+	private Button btnRefresh;
+
+	private Spinner filter;
+	private Spinner billStateFilter;
+	
+	
+	String[] columnNames = new String[]{"ID","Money","Buyer_Name","ReturnsTime","BillState"};
+	
+	int[] columnIDs = new int[]{R.id.TextView1,R.id.TextView2,R.id.TextView3,R.id.TextView_Date,R.id.TextView_BillState};
+	
+	
+	class SumInfo{
+		public int RowCount;
+		public BigDecimal Money;
+		@Override
+		public String toString() {
+			return String.format("共%s条记录,%s元",RowCount,Money);
+		}
+		
+	}
+	
+	SumInfo mSumInfo = new SumInfo();
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Returns/Rpcs/MobileReturnRpc/Search";
+			RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+			
+			Resources resource = getResources();
+			String searchkey = (String) filter.getSelectedItem();
+			argument.setString("SearchKey", searchkey);
+		
+			argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());
+			
+			String dateText = buttonDate.getText().toString();
+			if(!StringUtil.IsNullOrEmpty(dateText)){
+				Date parseDate = DateTimeUtil.ParseDate(dateText);
+				argument.setDate("Date1", parseDate);
+			}
+			
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			mSumInfo.RowCount = rows.size();
+			mSumInfo.Money = new BigDecimal(0);
+			for(RpcObject row:rows){
+				mSumInfo.Money = mSumInfo.Money.add(row.getMoney("Money"));
+			}
+			
+			
+			adapter = new SimpleAdapter(ReturnListActivity.this, rows,
+					R.layout.order_list_item, columnNames,columnIDs);
+			adapter.setViewBinder(viewBinder);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+
+
+	};
+	ViewBinder viewBinder = new ViewBinder() {
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.TextView_Date) {
+				((TextView)view).setText(DateTimeUtil.FormatDate((Date) data));
+				return true;
+			}
+			else{
+				return false;
+			}
+		}
+	};
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.return_list);
+		initButtonRefresh();
+		
+		initListView();
+
+		initFilter();
+		
+		initButtonDate();
+
+		StartQuery();
+	}
+	
+	private void initButtonRefresh()
+	{
+		btnRefresh=(Button)findViewById(R.id.Button_Refresh);
+		btnRefresh.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				StartQuery();
+			}
+		});
+		
+	}
+	
+	
+	private void StartQuery() {
+		searchTask.execute();
+	}
+	
+	private void initButtonDate() {
+		buttonDate = ActivityUtil.FindButton(this, R.id.Button_Date);
+		DialogUtil.AddSelectDateDialog(buttonDate, new SetDate() {
+
+			public void setDate(Date date) {
+				StartQuery();
+			}
+
+		});
+	}
+	
+	private void initFilter() {
+		filter = ActivityUtil.Find(this, R.id.Spinner_Filter);
+		billStateFilter = (Spinner) findViewById(R.id.Spinner_BillStateFilter);
+		
+		OnItemSelectedListener listener = new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				StartQuery();
+				
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+				
+			}
+		};
+		
+		filter.setOnItemSelectedListener(listener);
+		billStateFilter.setOnItemSelectedListener(listener);
+		
+	}
+	
+	private void initListView() {
+		listView = ActivityUtil.Find(this, R.id.ListView);
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("ID", (Long) map.get("ID"));
+				intent.setClass(arg1.getContext(), ReturnEditActivity.class);
+				startActivityForResult(intent,ReturnEditActivity.RequestCode_Open);
+			}
+
+		});
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "刷新");
+		menu.add(0,2,1,"统计");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Menu.FIRST:
+			StartQuery();
+			break;
+		case 2:
+			DialogUtil.Alert(this, mSumInfo.toString());
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+}
diff --git a/src/BWP/MobileSale/Return/ReturnMainActivity.java b/src/BWP/MobileSale/Return/ReturnMainActivity.java
new file mode 100644
index 0000000..19fd030
--- /dev/null
+++ b/src/BWP/MobileSale/Return/ReturnMainActivity.java
@@ -0,0 +1,46 @@
+package BWP.MobileSale.Return;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class ReturnMainActivity extends LoginedActivity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.return_main);
+		
+		Button buttonOrderEdit = (Button)findViewById(R.id.Button_Main_ReturnEdit);
+		buttonOrderEdit.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, ReturnEditActivity.class);
+			}
+		});
+		
+		Button buttonOrderList = (Button)findViewById(R.id.Button_Main_ReturnList);
+		buttonOrderList.setOnClickListener(new OnClickListener(){
+
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, ReturnListActivity.class);				
+			}
+			
+		});
+		
+		Button buttonUserSet = (Button)findViewById(R.id.Button_Main_ReturnSetUserProfile);
+		buttonUserSet.setOnClickListener(new OnClickListener(){
+			
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, ReturnSetUserProfileActivity.class);				
+			}
+			
+		});
+		
+		
+	}
+}
diff --git a/src/BWP/MobileSale/Return/ReturnSelectGoodsActivity.java b/src/BWP/MobileSale/Return/ReturnSelectGoodsActivity.java
new file mode 100644
index 0000000..30c37dc
--- /dev/null
+++ b/src/BWP/MobileSale/Return/ReturnSelectGoodsActivity.java
@@ -0,0 +1,282 @@
+package BWP.MobileSale.Return;
+
+import java.math.BigDecimal;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.CommandService;
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.SelectGoodsActivity;
+import BWP.MobileSale.UserGoodsStarCommand;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.OnPromptGoodsListener;
+import BWP.MobileSale.Util.StringUtil;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.SimpleAdapter.ViewBinder;
+
+public class ReturnSelectGoodsActivity extends LoginedActivity {
+	private EditText searchKey;
+	private ListView listView;
+	private SimpleAdapter adapter;
+	private Boolean mStarred;
+	
+	private String MannerReturn="退货拉回";
+	private String MannerAbort="丢弃或销毁";
+
+	ViewBinder binder = new ViewBinder() {
+
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.CheckBox) {
+				CheckBox box = (CheckBox) view;
+				box.setChecked(selected.containsKey(data));
+				return true;
+			} 
+			else {
+				return false;
+			}
+		}
+
+	};
+
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Returns/Rpcs/MobileReturnGoodsRpc/Search";
+			RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+			argument.setString("SearchKey", searchKey.getText().toString());
+			argument.setBoolean("Starred", mStarred);
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			adapter = new SimpleAdapter(ReturnSelectGoodsActivity.this, rows,
+					R.layout.goods_multiselect_item, new String[] { "Name",
+							"Code", "ID", "Starred"}, new int[] {
+							R.id.TextView_Name, R.id.TextView_Code,
+							R.id.CheckBox, R.id.CheckBox_Star });
+			adapter.setViewBinder(binder);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+	};
+
+	LinkedHashMap<Long, RpcObject> selected = new LinkedHashMap<Long, RpcObject>();
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.return_selectgoods);
+
+		searchKey = ActivityUtil.Find(this, R.id.EditText_Search);
+		Button searchButton = ActivityUtil.Find(this, R.id.Button_Search);
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			/* (non-Javadoc)
+			 * @see android.widget.AdapterView.OnItemClickListener#onItemClick(android.widget.AdapterView, android.view.View, int, long)
+			 */
+			/* (non-Javadoc)
+			 * @see android.widget.AdapterView.OnItemClickListener#onItemClick(android.widget.AdapterView, android.view.View, int, long)
+			 */
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				final RpcObject data = (RpcObject) arg0.getItemAtPosition(arg2);
+				Long id = data.getLong("ID");
+				if (selected.containsKey(id)) {
+					selected.remove(id);
+				} else {
+					selected.put(id, data);
+					BigDecimal number = data.getMoney("UnitNum");
+					//BigDecimal price = data.getMoney("Price");
+					//Short manner = data.getShort("ReturnsManner");
+		
+					
+					String numStr="";
+					//String priceStr="";
+					//String mannerStr="";
+					if(number!=null)
+					{
+						numStr=number.toString();
+					}
+//					if(priceStr!=null)
+//					{
+//						priceStr=priceStr.toString();
+//					}
+					
+//					if(manner!=null)
+//					{
+//						if(manner == 0)
+//						{
+//							mannerStr=MannerReturn;
+//						}
+//						if(manner == 1)
+//						{
+//							mannerStr=MannerAbort;
+//						}
+//						
+//					}
+//					DialogUtil.Prompt(SelectGoodsActivity.this, "请输入",
+//							data.getString("Number"), StringUtil.ToString(number),InputType.TYPE_NUMBER_FLAG_DECIMAL, new OnPromptListener() {
+//								public void OnPrompt(String prompt) {
+//									data.setMoney("Number",StringUtil.ParseMoney(prompt));
+//								}
+//							});
+					try {
+						DialogUtil.PromptGoods(ReturnSelectGoodsActivity.this, "请输入", numStr,  "", new OnPromptGoodsListener() {
+							
+							@Override
+							public void OnPrompt(String num, String hadleType) {
+								
+								data.setMoney("UnitNum", StringUtil.ParseMoney(num));
+								//data.setMoney("Price", StringUtil.ParseMoney(price));							
+								
+								
+//								if(hadleType.equals(MannerReturn))
+//								{
+//									Short a=0;
+//									data.setShort("ReturnsManner", a);
+////									data.setNamedValue("ReturnsManner", a);								
+//									
+//								}
+//								else if(hadleType.equals(MannerAbort))
+//								{
+//									Short a=1;
+//									data.setShort("ReturnsManner", a);
+//									//data.setNamedValue("ReturnsManner", a);							
+//									
+//								}
+//								else
+//								{
+//									System.out.println("没有匹配的");
+//								}															
+								
+							}
+						});
+					} catch (Exception e) {						
+						e.printStackTrace();
+						System.out.println("错误："+e.getMessage());
+					}
+
+					
+				}
+			}
+
+		});
+
+		listView.setOnItemLongClickListener(new OnItemLongClickListener() {
+
+			public boolean onItemLongClick(AdapterView<?> parent, View view,
+					int position, long id) {
+				Log.i("SaleReturn", "setOnItemLongClickListener");
+
+				RpcObject data = (RpcObject) parent.getItemAtPosition(position);
+				Long goodsID = data.getLong("ID");
+				Boolean starred = data.getBoolean("Starred");
+				starred = !starred;
+				data.put("Starred", starred);
+				CheckBox box = (CheckBox) view.findViewById(R.id.CheckBox_Star);
+				box.setChecked(starred);
+				Log.i("SaleReturn", StringUtil.ToString(starred));
+
+				UserGoodsStarCommand command = new UserGoodsStarCommand(
+						goodsID, starred);
+				CommandService.AddCommand(command);
+				Intent intent = new Intent();
+				intent.setClass(view.getContext(), CommandService.class);
+				startService(intent);
+				return true;
+			}
+		});
+
+		Button okButton = ActivityUtil.Find(this, R.id.Button_OK);
+		okButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.putExtra("Result", selected.values().toArray());
+				ActivityUtil.Finish(ReturnSelectGoodsActivity.this, intent);
+			}
+
+		});
+
+		Button cancelButton = ActivityUtil.Find(this, R.id.Button_Cancel);
+		cancelButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				finish();
+			}
+
+		});
+
+		searchButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				BeginSearch();
+			}
+
+		});
+
+		searchButton.setOnLongClickListener(new OnLongClickListener() {
+
+			public boolean onLongClick(View v) {
+				new AlertDialog.Builder(v.getContext())
+						.setTitle("搜索范围")
+						.setItems(R.array.search_starred_options,
+								new DialogInterface.OnClickListener() {
+
+									public void onClick(DialogInterface dialog,
+											int which) {
+										switch (which) {
+										case 0:
+											mStarred = null;
+											break;
+										case 1:
+											mStarred = true;
+											break;
+										case 2:
+											mStarred = false;
+											break;
+										}
+										BeginSearch();
+									}
+								}).show();
+				return true;
+			}
+		});
+
+		mStarred = true;
+		BeginSearch();
+	}
+
+	void BeginSearch() {
+		searchTask.execute();
+	}
+}
diff --git a/src/BWP/MobileSale/Return/ReturnSetUserProfileActivity.java b/src/BWP/MobileSale/Return/ReturnSetUserProfileActivity.java
new file mode 100644
index 0000000..aa530a0
--- /dev/null
+++ b/src/BWP/MobileSale/Return/ReturnSetUserProfileActivity.java
@@ -0,0 +1,215 @@
+package BWP.MobileSale.Return;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Config.LoginUserConfig;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.ConfigUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+
+public class ReturnSetUserProfileActivity extends LoginedActivity {
+
+	Spinner spDept;
+	Spinner spStore;
+	Spinner spReturnType;
+	Spinner spAccountUnit;
+	Spinner spHandleType;
+	private LoginUserConfig config = new LoginUserConfig(this);
+	private RpcObject mDmo;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.return_setuserprofile);
+		loadTask.execute();
+	}
+	
+	CallableTask loadTask = new CallableTask(ReturnSetUserProfileActivity.this, "读取中...") 
+	{
+
+		@Override
+		public Object call() throws Exception {
+			ConfigUtil.Fill(config);
+			
+			String method = "/Sale/Returns/Rpcs/MobileReturnRpc/LoadUserProfile";
+			mDmo = RpcFacade.rpcCall(method, config.Username);
+			if(mDmo==null)
+			{
+				mDmo=RpcObject.create("/Sale/Returns/BO/UserProfile");
+			}
+			System.out.println(mDmo);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {			
+			try {
+				initControls();				
+			} catch (JsonRpcException e) {
+				DialogUtil.Alert(ReturnSetUserProfileActivity.this, e.getDetailMessage());
+				e.printStackTrace();
+			}
+		}
+		
+	};
+	
+	private void initControls() throws JsonRpcException
+	{
+		initDept();
+		initStore();
+		initReturnType();
+		initAccountUnit();
+		initHandleType();
+		initButton();
+	}
+	private void initButton()
+	{
+		Button btnReturn=(Button)findViewById(R.id.Return_SetUser_Ruturn);
+		btnReturn.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		
+		Button btnSave=(Button)findViewById(R.id.Return_SetUser_Save);
+		btnSave.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				saveTask.execute();
+				
+			}
+		});
+	}
+	
+	CallableTask saveTask = new CallableTask(ReturnSetUserProfileActivity.this, "保存中...") 
+	{
+
+		@Override
+		public Object call() throws Exception {
+			
+			//UpdateUserProfile
+			mDmo.setString("ReturnsRecord_Dept_Name", (String)spDept.getSelectedItem());
+			mDmo.setString("ReturnsRecord_AccountingUnit_Name", (String)spAccountUnit.getSelectedItem());
+			mDmo.setString("ReturnsRecord_Store_Name", (String)spStore.getSelectedItem());
+			mDmo.setString("ReturnsRecord_ReturnsType_Name", (String)spReturnType.getSelectedItem());
+			
+			
+			String method = "/Sale/Returns/Rpcs/MobileReturnRpc/UpdateUserProfile";	
+			
+			RpcFacade.rpcCall(method,config.Username,mDmo,(String)spHandleType.getSelectedItem());
+			
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			DialogUtil.AutoHiddenAlert(ReturnSetUserProfileActivity.this, "保存成功");
+			finish();
+		}
+		
+	};
+	
+	private void initDept() throws JsonRpcException
+	{
+		spDept=(Spinner)findViewById(R.id.return_setuser_setdept);		
+
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadDept";		
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}	
+		
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(ReturnSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		spDept.setAdapter(adapter);		
+		
+		spDept.setSelection(list.indexOf(mDmo.getString("ReturnsRecord_Dept_Name")));
+		
+	}
+	private void initStore()throws JsonRpcException
+	{
+		spStore=(Spinner)findViewById(R.id.return_setuser_setstore);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadStore";		
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}		
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(ReturnSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		spStore.setAdapter(adapter);
+		spStore.setSelection(list.indexOf(mDmo.getString("ReturnsRecord_Store_Name")));
+	}
+	private void initReturnType() throws JsonRpcException
+	{
+		spReturnType=(Spinner)findViewById(R.id.return_setuser_setreturntype);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Returns/Rpcs/MobileReturnRpc/LoadReturnsType";		
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}		
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(ReturnSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		spReturnType.setAdapter(adapter);
+		spReturnType.setSelection(list.indexOf(mDmo.getString("ReturnsRecord_ReturnsType_Name")));
+	}
+	private void initAccountUnit() throws JsonRpcException
+	{
+		spAccountUnit=(Spinner)findViewById(R.id.return_setuser_setaccountunit);
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		String method = "/Sale/Sale/Rpcs/MobileLoadRpc/LoadAccountingUnit";		
+		DFDataTable table = RpcFacade.rpcCall(method);
+		List<RpcObject> rows = table.getRows();
+		for (RpcObject rpcObject : rows) {
+			list.add(rpcObject.getString("Name"));
+		}		
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(ReturnSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		spAccountUnit.setAdapter(adapter);
+		spAccountUnit.setSelection(list.indexOf(mDmo.getString("ReturnsRecord_AccountingUnit_Name")));
+	}
+	private void initHandleType()
+	{
+		spHandleType=(Spinner)findViewById(R.id.return_setuser_sethandletype);
+		
+		List<String> list=new  ArrayList<String>();
+		list.add("");
+		list.add("退货拉回");
+		list.add("丢弃或销毁");
+		ArrayAdapter<String> adapter=new ArrayAdapter<String>(ReturnSetUserProfileActivity.this, android.R.layout.simple_spinner_item, list);
+		spHandleType.setAdapter(adapter);
+		if(mDmo.getNamedValue("ReturnsRecord_ReturnsManner")!=null)
+		{
+			if(mDmo.getNamedValue("ReturnsRecord_ReturnsManner").getValue()==0)
+			{
+				spHandleType.setSelection(1);
+			}
+			else if(mDmo.getNamedValue("ReturnsRecord_ReturnsManner").getValue()==1)
+			{
+				spHandleType.setSelection(2);
+			}
+		}
+		
+	}
+}
diff --git a/src/BWP/MobileSale/Return/SelectSaleOutStoreActivity.java b/src/BWP/MobileSale/Return/SelectSaleOutStoreActivity.java
new file mode 100644
index 0000000..f8a5ed9
--- /dev/null
+++ b/src/BWP/MobileSale/Return/SelectSaleOutStoreActivity.java
@@ -0,0 +1,161 @@
+package BWP.MobileSale.Return;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Util.CallableTask;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.SimpleAdapter.ViewBinder;
+
+public class SelectSaleOutStoreActivity extends LoginedActivity {
+	private EditText searchKey;
+	private ListView listView;
+	private SimpleAdapter adapter;
+	private Boolean mStarred;
+	LinkedHashMap<Long, RpcObject> selected = new LinkedHashMap<Long, RpcObject>();
+
+	ViewBinder binder = new ViewBinder() {
+
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			//System.out.println("进入了");
+			if (view.getId() == R.id.return_selectsaleoutstore_listview_check) {
+				CheckBox box = (CheckBox) view;
+				box.setChecked(selected.containsKey(data));
+				//System.out.println(data.toString());
+				return true;
+			} 
+			else {
+				return false;
+			}
+		}
+
+	};
+	
+
+	
+	String[] s=new String[]{"SaleOutStore_ID","Goods_Name","Price","ID"};
+	CallableTask searchTask=new CallableTask(this,"查询中...") {
+		
+		@Override
+		public Object call() throws Exception {
+			
+			
+			Intent intent=getIntent();
+			long buyerid=intent.getLongExtra("Buyer_ID", 0);
+			//System.out.println("得到的购货客户ID"+buyerid);
+			String method = "/Sale/Returns/Rpcs/MobileReturnRpc/SearchSaleOutStore";
+			RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+			argument.setString("SearchKey", searchKey.getText().toString());
+			argument.setLong("LastMaxId", buyerid);
+			
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			adapter = new SimpleAdapter(SelectSaleOutStoreActivity.this, rows,
+					R.layout.return_selectsaleoutstore_listview, s, new int[] {
+							R.id.return_selectsaleoutstore_listview_id, R.id.return_selectsaleoutstore_listview_goodsname,
+							R.id.return_selectsaleoutstore_listview_price,R.id.return_selectsaleoutstore_listview_check});
+			adapter.setViewBinder(binder);
+			
+			
+			return null;
+		}
+		
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+	};
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.return_selectsaleoutstore);
+		
+		
+		Button btnOk=(Button)findViewById(R.id.SaleOutStore_Button_OK);
+		btnOk.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				Intent intent=new Intent();
+				intent.putExtra("Result", selected.values().toArray());
+				setResult(RESULT_OK, intent);
+				finish();
+			}
+		});
+		
+		
+		Button btnCancel=(Button)findViewById(R.id.SaleOutStore_Button_Cancel);
+		btnCancel.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		
+		initSearch();		
+		
+		initListView();
+		
+		
+		searchTask.execute();
+	}
+	private void initSearch()
+	{
+		searchKey=(EditText)findViewById(R.id.SaleOutStore_EditText_Search);
+		Button searchButton=(Button)findViewById(R.id.SaleOutStore_Button_Search);
+		searchButton.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				searchTask.execute();
+			}
+		});
+	}
+	
+	private void initListView()
+	{
+		listView=(ListView)findViewById(R.id.SaleOutStore_ListView);
+		listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@Override
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				RpcObject data=(RpcObject)arg0.getItemAtPosition(arg2);
+				Long id = data.getLong("ID");
+				
+				if (selected.containsKey(id)) {
+					selected.remove(id);
+					//box.setChecked(false);
+				} else {
+					selected.put(id, data);
+					//System.out.println("Insert id :"+id);
+					//box.setChecked(true);					
+				
+				}
+				
+			}
+		});
+		
+	}
+
+}
diff --git a/src/BWP/MobileSale/SaleApplication.java b/src/BWP/MobileSale/SaleApplication.java
new file mode 100644
index 0000000..061199c
--- /dev/null
+++ b/src/BWP/MobileSale/SaleApplication.java
@@ -0,0 +1,90 @@
+package BWP.MobileSale;
+
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.platform.AndroidPlatform;
+import org.forks.jsonrpc.platform.Platform;
+
+
+
+import BWP.MobileSale.Config.LastLoginInfo;
+import BWP.MobileSale.Util.ConfigUtil;
+import BWP.MobileSale.Util.StringUtil;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+import android.os.StrictMode;
+import android.util.Log;
+
+@SuppressLint("NewApi")
+public class SaleApplication extends Application {
+	
+	
+	static LastLoginInfo mLoginInfo; 
+	@Override
+	public void onCreate() {
+	   	String strVer=android.os.Build.VERSION.RELEASE;
+    	strVer=strVer.substring(0,3).trim();
+    	float fv=Float.valueOf(strVer);
+    	if(fv>2.3)
+    	{
+    		
+    		StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().detectDiskReads().detectDiskWrites().detectNetwork().penaltyLog().build());
+    		StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectLeakedSqlLiteObjects().detectLeakedSqlLiteObjects().penaltyLog().penaltyDeath().build());
+       	}
+		
+		super.onCreate();
+		
+		Platform.init(new AndroidPlatform(this));
+		RpcFacade.init("AndroidSale");
+		mLoginInfo = new LastLoginInfo(this);
+		ConfigUtil.Fill(mLoginInfo);		
+		reLogin();
+	}
+	
+
+	private void reLogin() {
+		
+		if (RpcFacade.isLogedIn()) {
+			return;
+		}
+
+		if (StringUtil.IsNullOrEmpty(mLoginInfo.Username)) {
+			return;
+		}
+
+		long currentTimeMillis = System.currentTimeMillis();
+		if (currentTimeMillis - mLoginInfo.CurrentTimeMillis > 30 * 60 * 1000) {
+			return;
+		}
+
+		try {
+			RpcFacade.login(mLoginInfo.Username, mLoginInfo.Password);
+		} catch (JsonRpcException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	public static void UpdateLastActiveTime() {
+		if(StringUtil.IsNullOrEmpty(mLoginInfo.Username)){
+			Log.e("SaleApplication", "还没有登录，不能调用UpdateLastActiveTime()方法");
+			return;
+		}
+		mLoginInfo.CurrentTimeMillis = System.currentTimeMillis();
+		ConfigUtil.Save(mLoginInfo);
+	}
+	
+	public static void ClearLogin(){
+		mLoginInfo.Username = "";
+		ConfigUtil.Save(mLoginInfo);
+	}
+	
+	public static void SaveLogin(String username,String password){
+		mLoginInfo.Username = username;
+		mLoginInfo.Password = password;
+		mLoginInfo.CurrentTimeMillis = System.currentTimeMillis();
+		ConfigUtil.Save(mLoginInfo);
+	}
+
+}
diff --git a/src/BWP/MobileSale/SaleOutStore/SaleOutStoreEditActivity.java b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreEditActivity.java
new file mode 100644
index 0000000..d145578
--- /dev/null
+++ b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreEditActivity.java
@@ -0,0 +1,232 @@
+package BWP.MobileSale.SaleOutStore;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.forks.jsonrpc.ManyList;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.SelectAccountingUnitActivity;
+import BWP.MobileSale.SelectBuyerActivity;
+import BWP.MobileSale.SelectGoodsActivity;
+import BWP.MobileSale.SelectRemarkActivity;
+import BWP.MobileSale.SelectStoreActivity;
+import BWP.MobileSale.Order.OrderDetailEditActivity;
+import BWP.MobileSale.Order.OrderEditActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.widget.SelectSimpleAdapter;
+import android.app.AlertDialog;
+import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+
+public class SaleOutStoreEditActivity extends LoginedActivity {
+
+	public static RpcObject EditingDetail;
+
+	static final int RequestCode_SelectBuyer = 1;
+	static final int RequestCode_SelectGoods = 2;
+	static final int RequestCode_Open = 3; // 打开单据
+	static final int RequestCode_EditDetail = 4;
+	static final int RequestCode_SelectRemark = 5;
+	static final int RequestCode_SelectAccountingUnit = 6;
+	static final int RequestCode_SelectStore = 7;
+ 
+	private TextView textView_BuyerName;
+	private TextView textView_BuyerCode;
+  
+	private long mBillID;
+	private RpcObject mDmo;
+	private int selectedPosition = -1;
+ 
+	boolean mEnableCheck = false;
+	boolean mEnableDelete = false;
+	private TextView button_Date;
+	private TextView textView_WrappageAllNum;
+	private ListView listView;
+
+	private TextView textViewDetailCount;
+	String detailSearchKey;
+	private int firstVisiblePosition;
+	private Button btnReturn;
+ 
+	//private boolean isOrNotShowSecond;
+ 
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.saleoutstore_edit);
+		Intent intent = getIntent();
+		mBillID = intent.getLongExtra("ID", 0);
+		btnReturn = (Button) this.findViewById(R.id.Order_Button_Return);
+
+		btnReturn.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		initBillTask.execute();
+	}
+
+	CallableTask initBillTask = new CallableTask(this, "读取单据中...") {
+		public Object call() throws Exception {
+			if (mBillID > 0) {
+				String method = "/Sale/Sale/Rpcs/SaleOutStoreRpc/Load";
+				mDmo = RpcFacade.rpcCall(method, mBillID);
+
+			} else {
+				mDmo = RpcObject.create("/Sale/Sale/BO/SaleOutStore");
+				mDmo.setDate("ArriveTime", new Date());
+			}
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+
+			initControls();
+			applyToUI();
+		}
+
+	};
+
+	private void initControls() {
+
+		InitListView();
+		InitDate();
+ 
+		InitBuyer();
+ 
+		InitWrappageAllNum();
+	}
+
+	private void InitDate() {
+		button_Date = ActivityUtil.Find(this, R.id.Order_Button_Date);
+ 
+	}
+
+	private void InitBuyer() {
+		textView_BuyerName = ActivityUtil.Find(this,
+				R.id.Order_TextView_BuyerName);
+		textView_BuyerCode = ActivityUtil.Find(this,
+				R.id.Order_TextView_BuyerCode);
+
+	}
+
+	private void InitWrappageAllNum() {
+ 
+		textView_WrappageAllNum = ActivityUtil.Find(this,
+				R.id.Order_TextView_WrappageAllNum);
+		 
+	}
+ 
+	private void InitListView() {
+		textViewDetailCount = ActivityUtil.Find(this,
+				R.id.Order_TextView_DetailCount);
+		listView = ActivityUtil.Find(this, R.id.Order_ListView);
+   
+
+		listView.setOnScrollListener(new OnScrollListener() {
+
+			public void onScroll(AbsListView arg0, int arg1, int arg2, int arg3) {
+				// TODO Auto-generated method stub
+
+			}
+
+			public void onScrollStateChanged(AbsListView arg0, int arg1) {
+				if (arg1 == OnScrollListener.SCROLL_STATE_IDLE) {
+					firstVisiblePosition = listView.getFirstVisiblePosition();
+				}
+
+			}
+
+		});
+
+ 
+	}
+
+	private void applyToUI() {
+		if (mDmo == null) {
+			DialogUtil.Alert(SaleOutStoreEditActivity.this, "当前可编辑的对象为空");
+			finish();
+			return;
+		}
+
+		if (mBillID > 0) {
+			this.setTitle(String.format("%s-出库单No.%s(%s)",
+					getString(R.string.app_name), mBillID,
+					mDmo.getNamedValue("BillState")));
+		}
+
+		textView_BuyerName.setText(mDmo.getString("Buyer_Name"));
+		textView_BuyerCode.setText(mDmo.getString("Buyer_Code"));
+		if (mDmo.getMoney("WrappageAllNum") != null) {
+			textView_WrappageAllNum.setText(mDmo.getMoney("WrappageAllNum" ).toString() );
+		}
+		button_Date.setText(DateTimeUtil.FormatDate(mDmo.getDate("ArriveTime")));
+		ManyList details = mDmo.getManyList("Details");
+
+		BigDecimal allMoney = new BigDecimal(0);
+		BigDecimal allNum = new BigDecimal(0);		
+		for (int i = 0; i < details.size(); i++) {
+			RpcObject item = details.get(i);
+			BigDecimal price = item.getMoney("Price");
+			if (price == null) {
+				price = new BigDecimal(0);
+			}
+			BigDecimal number = item.getMoney("UnitNum");
+			if (number == null) {
+				number = new BigDecimal(0);
+			}
+			allNum = allNum.add(number);
+			allMoney = allMoney.add(price.multiply(number));
+		}
+
+		textViewDetailCount.setText(String.format("%s￥ %.2f,%.2f", details.size(),
+				allMoney,allNum));
+
+		SelectSimpleAdapter adapter = new SelectSimpleAdapter(
+				SaleOutStoreEditActivity.this, details,
+				R.layout.saleoutstore_edit_detail_list_item, new String[] {
+						"Goods_Name", "UnitNum",  "Price",
+						"Money" }, new int[] { R.id.Goods_Name,
+						R.id.Number,  R.id.Price,
+						R.id.Money });
+		adapter.setSelect(selectedPosition);
+		listView.setAdapter(adapter);
+		if (firstVisiblePosition == -1) {
+			firstVisiblePosition = details.size() - 1;
+		} else if (firstVisiblePosition > details.size() - 1) {
+			firstVisiblePosition = details.size() - 1;
+		}
+		listView.setSelection(firstVisiblePosition);
+
+	}
+}
diff --git a/src/BWP/MobileSale/SaleOutStore/SaleOutStoreListActivity.java b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreListActivity.java
new file mode 100644
index 0000000..975879f
--- /dev/null
+++ b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreListActivity.java
@@ -0,0 +1,300 @@
+package BWP.MobileSale.SaleOutStore;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+ 
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.DialogUtil.SetDate;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.SimpleAdapter.ViewBinder;
+
+public class SaleOutStoreListActivity extends LoginedActivity {
+
+	int pageCount = 0;
+	boolean flag = false;
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		// TODO Auto-generated method stub
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		switch(requestCode){
+		case SaleOutStoreEditActivity.RequestCode_Open:
+			StartQuery(false);
+			break;
+		}
+	}
+
+	private int GetPageCount(){
+		String method = "/Sale/Sale/Rpcs/SaleOutStoreRpc/GetSaleOutStorePageNum";
+		try{
+			RpcObject argument = SetArgument();
+			return RpcFacade.rpcCall(method,argument);
+		}catch(Exception e){
+					
+		}
+		return 0;
+	}
+
+	ViewBinder viewBinder = new ViewBinder() {
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.TextView_Date) {
+				((TextView)view).setText(DateTimeUtil.FormatDate((Date) data));
+				return true;
+			}
+			else{
+				return false;
+			}
+		}
+	};
+	
+	String[] columnNames = new String[]{"ID","Money","Buyer_Name","Date","BillState"};
+	
+	int[] columnIDs = new int[]{R.id.TextView1,R.id.TextView2,R.id.TextView3,R.id.TextView_Date,R.id.TextView_BillState};
+	
+	class SumInfo{
+		public int RowCount;
+		public BigDecimal Money;
+		@Override
+		public String toString() {
+			return String.format("共%s条记录,%s元",RowCount,Money);
+		}
+		
+	}
+	
+	SumInfo mSumInfo = new SumInfo();
+	int pageIndex = 1;
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/SaleOutStoreRpc/Search";
+			
+			if(flag == false){
+				pageCount = GetPageCount();
+			}
+ 
+			RpcObject argument = SetArgument();
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			mSumInfo.Money = new BigDecimal(0);
+			for(RpcObject row:rows){
+				mSumInfo.Money = mSumInfo.Money.add(row.getMoney("Money"));
+			}
+			adapter = new SimpleAdapter(SaleOutStoreListActivity.this, rows,
+					R.layout.saleoutstore_list_item, columnNames,columnIDs);
+			adapter.setViewBinder(viewBinder);
+			return null;
+			
+		}
+
+		
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+
+
+	};
+	
+	private RpcObject SetArgument() throws ParseException {
+		RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+		argument.setString("SearchKey2", (String)billStateFilter.getSelectedItem());
+		argument.setString("OrderBy", (String)orderByFilter.getSelectedItem());
+		String dateText = buttonDate.getText().toString();
+		String dateText2 = buttonEndDate.getText().toString();
+		if(!StringUtil.IsNullOrEmpty(dateText)){
+			Date parseDate = (Date) DateTimeUtil.ParseDate(dateText);
+			argument.setDate("Date1", parseDate);
+		}
+		if(!StringUtil.IsNullOrEmpty(dateText2)){
+			Date parseEndDate = (Date) DateTimeUtil.ParseDate(dateText2);
+			argument.setDate("Date2", parseEndDate);
+		}
+		argument.setInt("PageIndex", pageIndex);
+		return argument;
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "刷新");
+		menu.add(0,2,1,"统计");
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case Menu.FIRST:
+			StartQuery(false);
+			break;
+		case 2:
+			DialogUtil.Alert(this, mSumInfo.toString());
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.saleoutstore_list);
+
+		initButtonReturn();
+
+		initListView();
+
+		initFilter();
+		
+		initButtonDate();
+		initButtonNextPage();
+		initButtonUpPage();
+		StartQuery(false);
+
+	}
+
+	private void initFilter() {
+		orderByFilter = (Spinner) findViewById(R.id.Spinner_OrderBy);
+		billStateFilter = (Spinner) findViewById(R.id.Spinner_BillStateFilter);
+		
+		OnItemSelectedListener listener = new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				pageIndex = 1;
+				StartQuery(false);
+				
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+				
+			}
+		};
+		
+		orderByFilter.setOnItemSelectedListener(listener);
+		billStateFilter.setOnItemSelectedListener(listener);
+		
+	}
+
+	private void initButtonReturn() {
+		ActivityUtil.FindButton(this, R.id.Button_Return)
+
+		.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View v) {
+				finish();
+			}
+		});
+	}
+	
+	private void initButtonNextPage() {
+		ActivityUtil.FindButton(this, R.id.Button_NextPage)
+		.setOnClickListener(new OnClickListener(){
+			public void onClick(View v) {
+				pageIndex++;
+				if(pageIndex >= pageCount){
+					return;
+				}
+				StartQuery(true);
+			}
+		});
+	}
+	
+	private void initButtonUpPage() {
+		ActivityUtil.FindButton(this, R.id.Button_UpPage)
+		.setOnClickListener(new OnClickListener(){
+			public void onClick(View v) {
+				
+				pageIndex--;
+				if(pageIndex <= 0){
+					return;
+				}
+				StartQuery(true);
+			}
+		});
+	}
+	private void initListView() {
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("ID", (Long) map.get("ID"));
+				intent.setClass(arg1.getContext(), SaleOutStoreEditActivity.class);
+				startActivityForResult(intent,
+						SaleOutStoreEditActivity.RequestCode_Open);
+			}
+
+		});
+	}
+
+	private void initButtonDate() {
+		buttonDate = ActivityUtil.FindButton(this, R.id.Button_Date);
+		DialogUtil.AddSelectDateDialog(buttonDate, new SetDate() {			
+
+			@Override
+			public void setDate(java.util.Date date) {
+				pageIndex = 1;
+				StartQuery(false);
+			}
+
+		});
+		buttonEndDate = ActivityUtil.FindButton(this, R.id.Button_EndDate);
+		DialogUtil.AddSelectDateDialog(buttonEndDate, new SetDate() {			
+
+			@Override
+			public void setDate(java.util.Date date) {
+				pageIndex = 1;
+				StartQuery(false);
+			}
+
+		});
+	}
+
+	private void StartQuery(boolean flag2) {
+		flag = flag2;
+		searchTask.execute();
+	}
+
+	ListView listView;
+	private SimpleAdapter adapter;
+	private Button buttonDate;
+	private Button buttonEndDate;
+
+	private Spinner filter;
+	private Spinner billStateFilter;
+	private Spinner orderByFilter;
+}
diff --git a/src/BWP/MobileSale/SaleOutStore/SaleOutStoreMainActivity.java b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreMainActivity.java
new file mode 100644
index 0000000..02acfe3
--- /dev/null
+++ b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreMainActivity.java
@@ -0,0 +1,31 @@
+package BWP.MobileSale.SaleOutStore;
+
+import BWP.MobileSale.LoginedActivity;
+import BWP.MobileSale.R;
+import BWP.MobileSale.Utils;
+import BWP.MobileSale.Order.OrderEditActivity;
+import BWP.MobileSale.Order.OrderListActivity;
+import BWP.MobileSale.Order.OrderSetUserProfileActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class SaleOutStoreMainActivity  extends LoginedActivity {
+ 
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.saleoutstore_main);
+		 
+		Button buttonOrderList = (Button)findViewById(R.id.Button_Main_saleoutstoreList);
+		buttonOrderList.setOnClickListener(new OnClickListener(){
+
+			public void onClick(View arg0) {
+				Utils.ActivityUtil.Go(arg0, SaleOutStoreListActivity.class);
+			}
+			
+		});
+ 
+	}
+}
diff --git a/src/BWP/MobileSale/SelectAccountingUnitActivity.java b/src/BWP/MobileSale/SelectAccountingUnitActivity.java
new file mode 100644
index 0000000..05a46e1
--- /dev/null
+++ b/src/BWP/MobileSale/SelectAccountingUnitActivity.java
@@ -0,0 +1,106 @@
+package BWP.MobileSale;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+
+public class SelectAccountingUnitActivity extends LoginedActivity {
+	private SimpleAdapter adapter;
+	private ListView listView;
+	private EditText search;
+
+	private void BeginSearch() {
+		searchTask.execute();
+	}
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		setContentView(R.layout.selectbuyer);
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")			
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("Result", map);
+				ActivityUtil.Finish(SelectAccountingUnitActivity.this, intent);
+
+			}	
+
+		});
+		
+		
+	
+		
+		search = ActivityUtil.Find(this, R.id.EditText_Search);
+
+		Button button = ActivityUtil.Find(this, R.id.Button_Search);
+
+		button.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				BeginSearch();
+			}
+
+		});
+		searchTask.execute();
+		}
+	
+	ViewOnClickTask searchTask = new ViewOnClickTask(this, "查询中...") {
+		
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/AccountingUnitSearch";
+
+			RpcObject argument = RpcObject
+					.create("/Sale/Sale/Rpcs/RpcSearch");
+			argument.setString("SearchKey", search.getText()
+					.toString());
+
+			DFDataTable table = RpcFacade.rpcCall(method,argument);
+			List<RpcObject> rows = table.getRows();
+			
+			adapter = new SimpleAdapter(SelectAccountingUnitActivity.this,
+					rows, R.layout.batchno_select_item,
+					new String[] { "Name" },
+					new int[] { R.id.TextView_Name
+						});
+			
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+		
+	};	
+	
+}
diff --git a/src/BWP/MobileSale/SelectBatchNoActivity.java b/src/BWP/MobileSale/SelectBatchNoActivity.java
new file mode 100644
index 0000000..58a66bd
--- /dev/null
+++ b/src/BWP/MobileSale/SelectBatchNoActivity.java
@@ -0,0 +1,111 @@
+package BWP.MobileSale;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+
+public class SelectBatchNoActivity extends LoginedActivity {
+	private SimpleAdapter adapter;
+	private ListView listView;
+	private EditText search;
+	
+
+	private void BeginSearch() {
+		searchTask.execute();
+	}
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		setContentView(R.layout.selectbuyer);
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")			
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				RpcObject data = (RpcObject) arg0
+						.getItemAtPosition(arg2);
+						Long buyerID = data.getLong("ID");
+				Intent intent = new Intent();
+				intent.putExtra("Result", map);
+				ActivityUtil.Finish(SelectBatchNoActivity.this, intent);
+
+			}	
+
+		});
+		
+		
+	
+		
+		search = ActivityUtil.Find(this, R.id.EditText_Search);
+
+		Button button = ActivityUtil.Find(this, R.id.Button_Search);
+
+		button.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				BeginSearch();
+			}
+
+		});
+		searchTask.execute();
+		}
+	
+	ViewOnClickTask searchTask = new ViewOnClickTask(this, "查询中...") {
+		
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/BatchNoSearch";
+
+			RpcObject argument = RpcObject
+					.create("/Sale/Sale/Rpcs/RpcSearch");
+			argument.setString("SearchKey", search.getText()
+					.toString());
+
+			DFDataTable table = RpcFacade.rpcCall(method,argument);
+			List<RpcObject> rows = table.getRows();
+			
+			adapter = new SimpleAdapter(SelectBatchNoActivity.this,
+					rows, R.layout.batchno_select_item,
+					new String[] { "Name" },
+					new int[] { R.id.TextView_Name
+						});
+			
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+		
+	};
+	
+	
+}
diff --git a/src/BWP/MobileSale/SelectBuyerActivity.java b/src/BWP/MobileSale/SelectBuyerActivity.java
new file mode 100644
index 0000000..7301b8b
--- /dev/null
+++ b/src/BWP/MobileSale/SelectBuyerActivity.java
@@ -0,0 +1,189 @@
+package BWP.MobileSale;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+
+public class SelectBuyerActivity extends LoginedActivity {
+	private SimpleAdapter adapter;
+	private ListView listView;
+	private EditText search;
+	private Boolean mStarred;
+	
+
+	private void BeginSearch() {
+		searchTask.execute();
+	}
+	
+	String addMethod = "/Sale/Sale/Rpcs/MobileOrder_User_BuyerRpc/Add";
+	String removeMethod = "/Sale/Sale/Rpcs/MobileOrder_User_Buyerrpc/Remove";
+	
+	private void RemoveBuyer(long buyerID){
+		RpcFacade.rpcCall(removeMethod, buyerID);
+		
+	}
+
+	private void AddBuyer(long buyerID){
+		RpcFacade.rpcCall(addMethod, buyerID);
+		
+	}
+	
+	private String buyerType;
+	private boolean useUserVsCustomerSet;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.selectbuyer);
+		Intent intent = getIntent();
+		buyerType = intent.getStringExtra("BuyerType");
+		useUserVsCustomerSet =  intent.getBooleanExtra("UserVsCustomerSet",true);
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+			@SuppressWarnings("unchecked")			
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("Result", map);
+				ActivityUtil.Finish(SelectBuyerActivity.this, intent);
+
+			}	
+
+		});
+		
+		
+		listView.setOnItemLongClickListener(new OnItemLongClickListener() {
+
+			public boolean onItemLongClick(AdapterView<?> parent, View view,
+					int position, long id) {
+				RpcObject data = (RpcObject) parent
+				.getItemAtPosition(position);
+				Long buyerID = data.getLong("ID");
+				Boolean stared = data.getBoolean("Starred");
+				stared = !stared;
+				data.put("Starred", stared);
+				CheckBox box = (CheckBox) view.findViewById(R.id.CheckBox_Star);
+				box.setChecked(stared);
+				Log.i("SaleOrder", StringUtil.ToString(stared));
+				if(stared){
+					AddBuyer(buyerID);
+				}else{
+					RemoveBuyer(buyerID);
+				}
+				/*
+				UserBuyerStarCommand command = new UserBuyerStarCommand(buyerID,stared);
+				CommandService.AddCommand(command);
+				Intent intent = new Intent();
+				intent.setClass(view.getContext(), CommandService.class);
+				startService(intent);
+				*/
+				return true;
+			}
+		});
+		
+		search = ActivityUtil.Find(this, R.id.EditText_Search);
+
+		Button button = ActivityUtil.Find(this, R.id.Button_Search);
+
+		button.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				BeginSearch();
+			}
+
+		});
+		
+		button.setOnLongClickListener(new OnLongClickListener() {
+			
+
+			public boolean onLongClick(View v) {
+				new AlertDialog.Builder(v.getContext()).setTitle("搜索范围")
+				.setItems(R.array.search_starred_options,new DialogInterface.OnClickListener() {
+					
+					public void onClick(DialogInterface dialog, int which) {
+						switch(which){
+						case 0:
+							mStarred = null;
+							break;
+						case 1:
+							mStarred = true;
+							break;
+						case 2:
+							mStarred = false;
+							break;
+						}
+						BeginSearch();
+					}
+				}).show();
+				// TODO Auto-generated method stub
+				return true;
+			}
+		});
+		mStarred = true;
+		searchTask.execute();
+		
+		
+		}
+	
+	ViewOnClickTask searchTask = new ViewOnClickTask(this, "查询中...") {
+		
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderBuyerRpc/Search";
+			if(!useUserVsCustomerSet){
+				method = "/Sale/Sale/Rpcs/MobileOrderBuyerRpc/Search2";
+			}
+			if(buyerType!=null && buyerType.equals("调出客户")){
+				method = "/Sale/SaleXiWang/Rpcs/MobileAdjustGoodsBillRpc/SearchBuyerByUserVsBuyerSet";
+			}
+			
+			RpcObject argument = RpcObject
+					.create("/Sale/Sale/Rpcs/RpcSearch");
+			argument.setString("SearchKey", search.getText()
+					.toString());
+			argument.setBoolean("Starred", mStarred);
+
+			DFDataTable table = RpcFacade.rpcCall(method,argument);
+			List<RpcObject> rows = table.getRows();
+			
+			adapter = new SimpleAdapter(SelectBuyerActivity.this,
+					rows, R.layout.buyer_select_item,
+					new String[] { "Name", "Code","Starred" },
+					new int[] { R.id.TextView_Name,
+							R.id.TextView_Code,R.id.CheckBox_Star });
+			
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+		
+	};
+	
+	
+}
diff --git a/src/BWP/MobileSale/SelectGoodsActivity.java b/src/BWP/MobileSale/SelectGoodsActivity.java
new file mode 100644
index 0000000..b791684
--- /dev/null
+++ b/src/BWP/MobileSale/SelectGoodsActivity.java
@@ -0,0 +1,584 @@
+package BWP.MobileSale;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Config.LoginUserConfig;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import BWP.MobileSale.Util.DialogUtil;
+import BWP.MobileSale.Util.OnPromptListener;
+import BWP.MobileSale.Util.StringUtil;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.TableRow;
+import android.widget.TextView;
+import android.widget.SimpleAdapter.ViewBinder;
+import java.util.HashMap;
+
+public class SelectGoodsActivity extends LoginedActivity {
+	
+	LinkedHashMap<Long, HashMap<String, Object>> selected = new LinkedHashMap<Long, HashMap<String, Object>>();
+	
+	private EditText searchKey;
+	private ListView listView;
+	private SimpleAdapter adapter;
+	private Boolean mStarred;
+	
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderGoodsRpc/Search";
+			RpcObject argument = RpcObject.create("/Sale/Sale/Rpcs/RpcSearch");
+			argument.setString("SearchKey", searchKey.getText().toString());
+			argument.setBoolean("Starred", mStarred);
+			DFDataTable table = RpcFacade.rpcCall(method, argument);
+			List<RpcObject> rows = table.getRows();
+			adapter = new SimpleAdapter(SelectGoodsActivity.this, rows,
+					R.layout.goods_multiselect_item, new String[] { "Name",
+							"Code", "ID", "Starred"}, new int[] {
+							R.id.TextView_Name, R.id.TextView_Code,
+							R.id.CheckBox, R.id.CheckBox_Star });
+			adapter.setViewBinder(binder);
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+	};
+	
+	ViewBinder binder = new ViewBinder() {
+
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.CheckBox) {
+				CheckBox box = (CheckBox) view;
+				box.setChecked(selected.containsKey(data));
+				return true;
+			} 
+			else {
+				return false;
+			}
+		}
+
+	};
+	
+	String addMethod = "/Sale/Sale/Rpcs/MobileOrder_User_GoodsRpc/Add";
+	String removeMethod = "/Sale/Sale/Rpcs/MobileOrder_User_GoodsRpc/Remove";
+	
+	public void RemoveGoods(long mGoodsID){
+		RpcFacade.rpcCall(removeMethod, mGoodsID);
+		
+	}
+
+	public void AddGoods(long mGoodsID){
+		RpcFacade.rpcCall(addMethod, mGoodsID);
+		
+	}
+	long buyer_ID,accountingUnit_ID;
+	Date date;
+	static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+        
+		setContentView(R.layout.selectgoods);
+		Intent intent = getIntent();
+		if(intent.getSerializableExtra("Buyer_ID") != null){
+			buyer_ID = Long.parseLong(intent.getSerializableExtra("Buyer_ID").toString());
+		}
+		if(intent.getSerializableExtra("AccountingUnit_ID") == null){
+			accountingUnit_ID = 0;
+		}else{
+			accountingUnit_ID = Long.parseLong(intent.getSerializableExtra("AccountingUnit_ID").toString());
+		}
+		
+		String dateStr = intent.getSerializableExtra("Date").toString();
+		try {
+			 date = dateFormat.parse(dateStr);	
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		
+		
+		final boolean isOrNotShowSecond = intent.getBooleanExtra("IsOrNotShowSecond",false);
+		final boolean isEditSecond = intent.getBooleanExtra("IsEditSecond",true);
+		final boolean isEditMain = intent.getBooleanExtra("IsEditMain",true);
+		final boolean showRemark = intent.getBooleanExtra("ShowRemark",false);		
+		searchKey = ActivityUtil.Find(this, R.id.EditText_Search);
+		Button searchButton = ActivityUtil.Find(this, R.id.Button_Search);
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+
+		listView.setOnItemClickListener(new OnItemClickListener() {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckEditPriceRole";
+			final boolean hasEditPriceRole = RpcFacade.rpcCall(method);
+			String method3 = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsOrNotShowPolicyPrice";
+			final boolean isOrNotShowPolicyPrice = RpcFacade.rpcCall(method3);
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				final RpcObject data = (RpcObject) arg0.getItemAtPosition(arg2);
+				Long id = data.getLong("ID");
+				if (selected.containsKey(id)) {
+					selected.remove(id);
+				} else {
+					final HashMap<String,Object> lastData = new HashMap<String,Object>();
+					lastData.put("ID",data.get("ID"));
+					lastData.put("Name",data.get("Name"));
+					lastData.put("Code",data.get("Code"));
+					lastData.put("Spell",data.get("Spell"));
+					lastData.put("Number",null);
+					lastData.put("SecondNumber",null);
+					lastData.put("Price",null);
+					lastData.put("BatchNo_ID", null);
+					lastData.put("BatchNo_Name", null);
+					lastData.put("Remark", null);					
+					selected.put(id, lastData);
+					long goods_ID = Long.parseLong(data.get("ID").toString());
+					String method = "/Sale/Sale/Rpcs/MobileOrderRpc/GetLeftAndRightRatio";
+					final RpcObject orderDetail = RpcFacade.rpcCall(method, buyer_ID,goods_ID);
+					final BigDecimal goods_SecondaryUnit1RelativeRatio =  orderDetail.getMoney("Goods_SecondaryUnit1RelativeRatio");
+					final BigDecimal goods_SecondaryUnit1Ratio =  orderDetail.getMoney("Goods_SecondaryUnit1Ratio");
+					final BigDecimal leftRatio = orderDetail.getMoney("LeftRatio");
+					final BigDecimal rightRatio = orderDetail.getMoney("RightRatio");
+					lastData.put("Goods_SecondaryUnit1RelativeRatio", goods_SecondaryUnit1RelativeRatio);
+					lastData.put("Goods_SecondaryUnit1Ratio", goods_SecondaryUnit1Ratio);
+					lastData.put("LeftRatio", leftRatio);
+					lastData.put("RightRatio", rightRatio);
+					String method2 = "/Sale/Sale/Rpcs/MobileOrderRpc/GetPolicyPrice";
+					final BigDecimal policyPrice;
+					if(accountingUnit_ID > 0){
+						policyPrice = RpcFacade.rpcCall(method2, goods_ID,buyer_ID,date,accountingUnit_ID);	
+					}else{
+						policyPrice = RpcFacade.rpcCall(method2, goods_ID,buyer_ID,date,null);
+					}
+					lastData.put("PolicyPrice", policyPrice);
+					try {
+							PromptWithTwoInput(SelectGoodsActivity.this, "请输入数量和价格",
+									lastData.get("Name").toString(), lastData,isOrNotShowSecond,isOrNotShowPolicyPrice, hasEditPriceRole,isEditMain,isEditSecond,showRemark,new OnPromptListener() {
+										public void OnPrompt2(HashMap<String, Object> prompt) {
+											Object goodsNum = prompt.get("goodsNum");
+											Object goodsPrice = prompt.get("goodsPrice");
+											Object goodsSecondNum = prompt.get("goodsSecondNum");
+											Object goodsBatchNo_ID = prompt.get("goodsBatchNo_ID");
+											Object goodsBatchNo_Name = prompt.get("goodsBatchNo_Name");
+											Object remark = prompt.get("remark");											
+											if(goodsPrice!=null&&hasEditPriceRole==true){
+												lastData.put("Price",(BigDecimal)goodsPrice);
+											}
+											if(goodsNum!=null){
+												lastData.put("Number",(BigDecimal)goodsNum);
+											}
+											
+											if(goodsSecondNum!=null){
+												lastData.put("SecondNumber",(BigDecimal)goodsSecondNum);
+											}
+											if(goodsBatchNo_ID!=null){
+												lastData.put("BatchNo_ID",(Long)goodsBatchNo_ID);
+											}
+											if(goodsBatchNo_Name!=null){
+												lastData.put("BatchNo_Name",goodsBatchNo_Name.toString());
+											}											
+											if(remark!=null){
+												lastData.put("Remark",remark.toString());
+											}
+										}
+
+										@Override
+										public void OnPrompt(String prompt) {
+											// TODO Auto-generated method stub
+											
+										}
+
+									
+									});
+
+						
+					} catch (JsonRpcException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				
+				}
+			}
+
+		});
+		listView.setOnItemLongClickListener(new OnItemLongClickListener() {
+
+			public boolean onItemLongClick(AdapterView<?> parent, View view,
+					int position, long id) {
+				Log.i("SaleOrder", "setOnItemLongClickListener");
+
+				RpcObject data = (RpcObject) parent.getItemAtPosition(position);
+				Long goodsID = data.getLong("ID");
+				Boolean starred = data.getBoolean("Starred");
+				starred = !starred;
+				data.put("Starred", starred);
+				CheckBox box = (CheckBox) view.findViewById(R.id.CheckBox_Star);
+				box.setChecked(starred);
+				Log.i("SaleOrder", StringUtil.ToString(starred));
+				if(starred){
+					AddGoods(goodsID);
+				}else{
+					RemoveGoods(goodsID);
+				}
+				/*
+				UserGoodsStarCommand command = new UserGoodsStarCommand(
+						goodsID, starred);
+				CommandService.AddCommand(command);
+				Intent intent = new Intent();
+				intent.setClass(view.getContext(), CommandService.class);
+				startService(intent);
+				*/
+				return true;
+			}
+		});
+
+		Button okButton = ActivityUtil.Find(this, R.id.Button_OK);
+		okButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				Intent intent = new Intent();
+				intent.putExtra("Result", selected.values().toArray());
+				ActivityUtil.Finish(SelectGoodsActivity.this, intent);
+			}
+
+		});
+
+		Button cancelButton = ActivityUtil.Find(this, R.id.Button_Cancel);
+		cancelButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				finish();
+			}
+
+		});
+
+		searchButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				mStarred = null;
+				BeginSearch();
+			}
+
+		});
+
+		searchButton.setOnLongClickListener(new OnLongClickListener() {
+
+			public boolean onLongClick(View v) {
+				new AlertDialog.Builder(v.getContext())
+						.setTitle("搜索范围")
+						.setItems(R.array.search_starred_options,
+								new DialogInterface.OnClickListener() {
+
+									public void onClick(DialogInterface dialog,
+											int which) {
+										switch (which) {
+										case 0:
+											mStarred = null;
+											break;
+										case 1:
+											mStarred = true;
+											break;
+										case 2:
+											mStarred = false;
+											break;
+										} 
+										BeginSearch();
+									}
+								}).show();
+				return true;
+			}
+		});
+
+		mStarred = true;
+		BeginSearch();
+	}
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (resultCode != Activity.RESULT_OK) {
+			return;
+		}
+		if(requestCode == RequestCode_SelectBatchNo){
+			HashMap<String, Object> map = (HashMap<String, Object>) data
+					.getSerializableExtra("Result");
+			Object id = (Object) map.get("ID");
+			batchNo_ID.setText(id.toString());
+			batchNo.setText((String)map.get("Name"));
+
+		}
+	}
+	
+	
+	
+	static final int RequestCode_SelectBatchNo = 1;
+	static TextView batchNo;
+	static TextView batchNo_ID;
+	static TextView goodsPolicyPrice;
+	static EditText goodsNum;
+	static EditText goodsSecondNum;	
+	static EditText remark;
+	static EditText goodsPrice;
+
+	public static void PromptWithTwoInput(final Context context,
+			final String title, String message,
+			HashMap<String, Object> lastData, final boolean isOrNotShowSecond,
+			boolean isOrNotShowPolicyPrice, boolean hasEditPriceRole,
+			boolean isEditMain, boolean isEditSecond, boolean showRemark,
+			final OnPromptListener onprompt) {
+
+		LayoutInflater inflater = (LayoutInflater) context
+				.getSystemService(context.LAYOUT_INFLATER_SERVICE);
+		final View view;
+
+		view = inflater.inflate(R.layout.edittext, null);
+		String method = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsOrNotShowBatchNo";
+		final boolean hasShowBatchNoRole = RpcFacade.rpcCall(method);
+		if (hasShowBatchNoRole) {
+			Button selectBatchNo = (Button) view
+					.findViewById(R.id.SelectBatchNo);
+
+			selectBatchNo.setOnClickListener(new OnClickListener() {
+
+				@Override
+				public void onClick(View v) {
+					Intent intent = new Intent();
+					intent.setClass(v.getContext(), SelectBatchNoActivity.class);
+					Activity activity = (Activity) context;
+					activity.startActivityForResult(intent,
+							RequestCode_SelectBatchNo);
+				}
+			});
+			batchNo = (TextView) view.findViewById(R.id.BatchNo);
+			batchNo_ID = (TextView) view.findViewById(R.id.BatchNo_ID);
+		} else {
+			TableRow row = (TableRow) view.findViewById(R.id.tableRow4);
+			row.setVisibility(view.GONE);
+		}
+
+		goodsPolicyPrice = (TextView) view.findViewById(R.id.goodsPolicyPrice);
+		if (!hasEditPriceRole) {
+			TableRow row = (TableRow) view.findViewById(R.id.tableRow2);
+			row.setVisibility(view.GONE);
+		}
+		if (isOrNotShowPolicyPrice) {
+			BigDecimal PolicyPrice = (BigDecimal) lastData.get("PolicyPrice");
+			if (PolicyPrice.compareTo(new BigDecimal(0)) == 1) {
+				goodsPolicyPrice.setText(PolicyPrice.toString());
+			}
+		} else {
+			TableRow row = (TableRow) view.findViewById(R.id.tableRow3);
+			row.setVisibility(view.GONE);
+		}
+		remark = (EditText) view.findViewById(R.id.EditText_Remark);
+		if (!showRemark) {
+			TableRow row = (TableRow) view.findViewById(R.id.tableRow5);
+			row.setVisibility(view.GONE);
+		}
+		goodsNum = (EditText) view.findViewById(R.id.goodsNum);
+		goodsNum.setEnabled(isEditMain);
+
+		goodsNum.setText(StringUtil.ToString(lastData.get("Number")));
+		goodsSecondNum = (EditText) view.findViewById(R.id.goodsSecondNum);
+		goodsSecondNum.setEnabled(isEditSecond);
+
+		if (title != "请输入数量") {
+			EditText goodsPrice = (EditText) view.findViewById(R.id.goodsPrice);
+			goodsPrice.setText(StringUtil.ToString(lastData.get("Price")));
+		}
+		if (isOrNotShowSecond) {
+			goodsSecondNum.setText(StringUtil.ToString(lastData
+					.get("SecondNumber")));
+			final Object leftRatio = lastData.get("LeftRatio");
+			final Object rightRatio = lastData.get("RightRatio");
+			final Object goods_SecondaryUnit1RelativeRatio = lastData
+					.get("Goods_SecondaryUnit1RelativeRatio");
+			final Object goods_SecondaryUnit1Ratio = lastData
+					.get("Goods_SecondaryUnit1Ratio");
+			if (leftRatio != null && rightRatio != null
+					&& goods_SecondaryUnit1RelativeRatio != null
+					&& goods_SecondaryUnit1Ratio != null) {
+				final BigDecimal rightRatio2 = (BigDecimal) rightRatio;
+				final BigDecimal leftRatio2 = (BigDecimal) leftRatio;
+				final BigDecimal goods_SecondaryUnit1RelativeRatio2 = (BigDecimal) goods_SecondaryUnit1RelativeRatio;
+				final BigDecimal goods_SecondaryUnit1Ratio2 = (BigDecimal) goods_SecondaryUnit1Ratio;
+				goodsNum.addTextChangedListener(new TextWatcher() {
+
+					@Override
+					public void onTextChanged(CharSequence s, int start,
+							int before, int count) {
+						if (goodsNum.hasFocus()) {
+							BigDecimal number = StringUtil.ParseMoney(s
+									.toString());
+
+							if (number != null
+									&& goods_SecondaryUnit1Ratio2 != null
+									&& goods_SecondaryUnit1RelativeRatio2 != null) {
+								BigDecimal mainUnitNum = ((number).divide(
+										leftRatio2, 6,
+										BigDecimal.ROUND_HALF_EVEN))
+										.multiply(rightRatio2);
+								BigDecimal secondNumber = (mainUnitNum
+										.multiply(goods_SecondaryUnit1RelativeRatio2))
+										.divide(goods_SecondaryUnit1Ratio2, 6,
+												BigDecimal.ROUND_HALF_EVEN);
+								goodsSecondNum.setText(secondNumber.toString());
+
+							}
+						}
+
+					}
+
+					@Override
+					public void beforeTextChanged(CharSequence s, int start,
+							int count, int after) {
+						// TODO Auto-generated method stub
+
+					}
+
+					@Override
+					public void afterTextChanged(Editable s) {
+
+					}
+				});
+
+				goodsSecondNum.addTextChangedListener(new TextWatcher() {
+
+					@Override
+					public void onTextChanged(CharSequence s, int start,
+							int before, int count) {
+						if (goodsSecondNum.hasFocus()) {
+							BigDecimal secondNumber = StringUtil.ParseMoney(s
+									.toString());
+							if (secondNumber != null
+									&& goods_SecondaryUnit1Ratio2 != null
+									&& goods_SecondaryUnit1RelativeRatio != null) {
+								BigDecimal mainUnitNum = ((secondNumber)
+										.multiply(goods_SecondaryUnit1Ratio2))
+										.divide(goods_SecondaryUnit1RelativeRatio2);
+								BigDecimal number = (mainUnitNum
+										.divide(rightRatio2))
+										.multiply(leftRatio2);
+								goodsNum.setText(number.toString());
+							}
+						}
+					}
+
+					@Override
+					public void beforeTextChanged(CharSequence s, int start,
+							int count, int after) {
+						// TODO Auto-generated method stub
+
+					}
+
+					@Override
+					public void afterTextChanged(Editable s) {
+
+					}
+				});
+			}
+		} else {
+			goodsSecondNum.setVisibility(view.GONE);
+			TextView textView_Second = (TextView) view
+					.findViewById(R.id.TextView_SecondNum);
+			textView_Second.setVisibility(view.GONE);
+		}
+		Builder builder = new AlertDialog.Builder(context);
+		builder.setTitle(title)
+				.setMessage(message)
+				.setView(view)
+				.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+
+					public void onClick(DialogInterface arg0, int arg1) {
+						// EditText goodsNum =
+						// (EditText)view.findViewById(R.id.goodsNum);
+						// EditText goodsSecondNum =
+						// (EditText)view.findViewById(R.id.goodsSecondNum);
+						HashMap<String, Object> returnlist = new HashMap<String, Object>();
+						if (title != "请输入数量") {
+							goodsPrice = (EditText) view
+									.findViewById(R.id.goodsPrice);
+							returnlist.put("goodsNum", StringUtil
+									.ParseMoney(goodsNum.getText().toString()));
+							returnlist.put("goodsPrice",
+									StringUtil.ParseMoney(goodsPrice.getText()
+											.toString()));
+							if (isOrNotShowSecond) {
+								returnlist.put("goodsSecondNum", StringUtil
+										.ParseMoney(goodsSecondNum.getText()
+												.toString()));
+							}
+						} else {
+							returnlist.put("goodsNum", StringUtil
+									.ParseMoney(goodsNum.getText().toString()));
+							if (isOrNotShowSecond) {
+								returnlist.put("goodsSecondNum", StringUtil
+										.ParseMoney(goodsSecondNum.getText()
+												.toString()));
+							}
+						}
+						if (hasShowBatchNoRole) {
+							if (batchNo.getText() != null
+									&& batchNo.getText() != ""
+									&& batchNo_ID.getText() != null
+									&& batchNo_ID.getText() != "") {
+								String eee = batchNo.getText().toString();
+								String ddd = batchNo_ID.getText().toString();
+								returnlist.put("goodsBatchNo_Name", batchNo
+										.getText().toString());
+								returnlist.put("goodsBatchNo_ID", Long
+										.parseLong(batchNo_ID.getText()
+												.toString()));
+							}
+						}
+						returnlist.put("remark",  remark.getText().toString() );
+						onprompt.OnPrompt2(returnlist);
+					}
+				})
+				.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+
+					public void onClick(DialogInterface dialog, int which) {
+
+					}
+				}).show();
+
+	}
+
+	void BeginSearch() {
+		searchTask.execute();
+	}
+}
diff --git a/src/BWP/MobileSale/SelectRemarkActivity.java b/src/BWP/MobileSale/SelectRemarkActivity.java
new file mode 100644
index 0000000..913ba1c
--- /dev/null
+++ b/src/BWP/MobileSale/SelectRemarkActivity.java
@@ -0,0 +1,117 @@
+package BWP.MobileSale;
+
+import java.util.List;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+public class SelectRemarkActivity extends LoginedActivity {
+
+	private TextView textViewRemark;
+	private Spinner filter;
+	ArrayAdapter<String> adapter;
+	
+	ViewOnClickTask searchTask = new ViewOnClickTask(this, "查询中...") { 
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRemarkRpc/Load"; 
+			List<String> remarks = RpcFacade.rpcCall(method);
+			remarks.add(0, ""); 
+			adapter = new ArrayAdapter<String>(SelectRemarkActivity.this,
+					android.R.layout.simple_spinner_item, remarks);
+			adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); 
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			filter.setAdapter(adapter);
+
+		}
+
+	};
+
+ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") {
+		
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRemarkRpc/Save";
+
+			RpcObject argument = RpcObject
+					.create("/Sale/Sale/Rpcs/RpcSearch");
+			argument.setString("SearchKey", textViewRemark.getText()
+					.toString());
+			 
+			RpcFacade.rpcCall(method, argument); 
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			Intent intent = new Intent();
+			intent.putExtra("Result", textViewRemark.getText()
+					.toString());
+			ActivityUtil.Finish(SelectRemarkActivity.this, intent);
+		}
+		
+	};
+	
+	
+	private void InitRemark() {
+		textViewRemark = ActivityUtil.Find(this, R.id.EditText_Remark);
+		ActivityUtil.Find(this, R.id.EditText_Remark).setVisibility(
+				View.VISIBLE);
+	}
+
+	private void initFilter() {
+		filter = ActivityUtil.Find(this, R.id.Spinner_Filter);
+		filter.setSelection(-1);
+		filter.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				String v = filter.getSelectedItem().toString();
+				textViewRemark.setText(v);
+				if (!StringUtil.IsNullOrEmpty(v)) {
+					Intent intent = new Intent();
+					intent.putExtra("Result", filter.getSelectedItem()
+							.toString());
+					ActivityUtil.Finish(SelectRemarkActivity.this, intent);
+				}
+			}
+
+			public void onNothingSelected(AdapterView<?> parent) {
+
+			}
+		});
+	}
+	
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.selectremark);
+		ActivityUtil.FindButton(this, R.id.Button_Save).setOnClickListener(
+				new OnClickListener() {
+
+					public void onClick(View v) {
+						saveTask.execute(); 
+					}
+				});
+		InitRemark();
+		initFilter();
+
+		searchTask.execute();
+
+	}
+	
+}
diff --git a/src/BWP/MobileSale/SelectStoreActivity.java b/src/BWP/MobileSale/SelectStoreActivity.java
new file mode 100644
index 0000000..7959bd5
--- /dev/null
+++ b/src/BWP/MobileSale/SelectStoreActivity.java
@@ -0,0 +1,106 @@
+package BWP.MobileSale;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.StringUtil;
+import BWP.MobileSale.Util.ViewOnClickTask;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+
+public class SelectStoreActivity extends LoginedActivity {
+	private SimpleAdapter adapter;
+	private ListView listView;
+	private EditText search;
+
+	private void BeginSearch() {
+		searchTask.execute();
+	}
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		setContentView(R.layout.selectbuyer);
+		listView = ActivityUtil.Find(this, R.id.ListView);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")			
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>) arg0
+						.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				intent.putExtra("Result", map);
+				ActivityUtil.Finish(SelectStoreActivity.this, intent);
+
+			}	
+
+		});
+		
+		
+	
+		
+		search = ActivityUtil.Find(this, R.id.EditText_Search);
+
+		Button button = ActivityUtil.Find(this, R.id.Button_Search);
+
+		button.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View arg0) {
+				BeginSearch();
+			}
+
+		});
+		searchTask.execute();
+		}
+	
+	ViewOnClickTask searchTask = new ViewOnClickTask(this, "查询中...") {
+		
+		public Object call() throws Exception {
+			String method = "/Sale/Sale/Rpcs/MobileOrderRpc/StoreSearch";
+
+			RpcObject argument = RpcObject
+					.create("/Sale/Sale/Rpcs/RpcSearch");
+			argument.setString("SearchKey", search.getText()
+					.toString());
+
+			DFDataTable table = RpcFacade.rpcCall(method,argument);
+			List<RpcObject> rows = table.getRows();
+			
+			adapter = new SimpleAdapter(SelectStoreActivity.this,
+					rows, R.layout.batchno_select_item,
+					new String[] { "Name" },
+					new int[] { R.id.TextView_Name
+						});
+			
+			return null;
+		}
+
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+		
+	};	
+	
+}
diff --git a/src/BWP/MobileSale/ServerConfigActivity.java b/src/BWP/MobileSale/ServerConfigActivity.java
new file mode 100644
index 0000000..68ae89a
--- /dev/null
+++ b/src/BWP/MobileSale/ServerConfigActivity.java
@@ -0,0 +1,84 @@
+package BWP.MobileSale;
+
+import BWP.MobileSale.Config.ServerConfig;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.ConfigUtil;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class ServerConfigActivity extends Activity {
+	private EditText urlInput;
+	private EditText pageCountInput;
+	private ServerConfig config;
+	
+
+	String[] options= new String[]{"http://192.168.1.101:2000/MainSystem/",
+			"http://192.168.1.2/B2/",
+			"http://203.86.48.90:81/B2/","http://192.168.1.123:2000/MainSystem/","http://42.121.96.192/B2/"};
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, Menu.FIRST, 0, "设置测试地址");
+		// TODO Auto-generated method stub
+		return super.onCreateOptionsMenu(menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch(item.getItemId()){
+		case Menu.FIRST:
+			new AlertDialog.Builder(this).setItems(options,new DialogInterface.OnClickListener() {
+				
+				public void onClick(DialogInterface dialog, int which) {
+					urlInput.setText(options[which].toString());
+				}
+			}).show();
+			break;
+		
+		}
+		
+		return super.onOptionsItemSelected(item);
+		
+	}
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.activity_serverconfig);
+	
+		urlInput = ActivityUtil.Find(this,R.id.EditText_Url);
+		config = new ServerConfig(getBaseContext());
+		ConfigUtil.Fill(config);
+		urlInput.setText(config.getServerUri());
+	
+	
+		Button saveButton= ActivityUtil.FindButton(this,R.id.Button_OK);
+		saveButton.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View v) {
+				config.setServerUri(urlInput.getText().toString());
+				ConfigUtil.Save(config);
+				finish();
+			}
+		});
+		
+		
+		Button cancelButton = ActivityUtil.FindButton(this, R.id.Button_Cancel);
+		cancelButton.setOnClickListener(new OnClickListener(){
+
+			public void onClick(View arg0) {
+				finish();
+			}
+				
+		});
+	}
+	
+}
diff --git a/src/BWP/MobileSale/Ui/DownRefreshListView.java b/src/BWP/MobileSale/Ui/DownRefreshListView.java
new file mode 100644
index 0000000..f2726b1
--- /dev/null
+++ b/src/BWP/MobileSale/Ui/DownRefreshListView.java
@@ -0,0 +1,303 @@
+package BWP.MobileSale.Ui;
+
+import java.util.Date;
+import BWP.MobileSale.R;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+public class DownRefreshListView extends ListView implements OnScrollListener {
+	private final static int RELEASE_To_REFRESH = 0;
+	private final static int PULL_To_REFRESH = 1;
+	//正在刷新
+	private final static int REFRESHING = 2;
+	//刷新完成
+	private final static int DONE = 3;
+	private final static int LOADING = 4;
+
+	private final static int RATIO = 3;
+	private LayoutInflater inflater;
+	private LinearLayout headView;
+	private TextView tipsTextview;
+	private TextView lastUpdatedTextView;
+	private ImageView arrowImageView;
+	private ProgressBar progressBar;
+
+	private RotateAnimation animation;
+	private RotateAnimation reverseAnimation;
+	private boolean isRecored;
+	private int headContentWidth;
+	private int headContentHeight;
+	private int startY;
+	private int firstItemIndex;
+	private int state;
+	private boolean isBack;
+	private OnRefreshListener refreshListener;
+	private boolean isRefreshable;
+	
+	int i=1;
+
+	public DownRefreshListView(Context context) {
+		super(context);
+		init(context);
+	}
+
+	public DownRefreshListView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		init(context);
+	}
+
+	private void init(Context context) {
+		setCacheColorHint(context.getResources().getColor(R.color.transparent));
+		inflater = LayoutInflater.from(context);
+		headView = (LinearLayout) inflater.inflate(R.layout.head, null);
+		arrowImageView = (ImageView) headView.findViewById(R.id.head_arrowImageView);
+		arrowImageView.setMinimumWidth(70);
+		arrowImageView.setMinimumHeight(50);
+		progressBar = (ProgressBar) headView.findViewById(R.id.head_progressBar);
+		tipsTextview = (TextView) headView.findViewById(R.id.head_tipsTextView);
+		lastUpdatedTextView = (TextView) headView.findViewById(R.id.head_lastUpdatedTextView);
+
+		measureView(headView);
+		headContentHeight = headView.getMeasuredHeight();
+		headContentWidth = headView.getMeasuredWidth();
+		headView.setPadding(0, -1 * headContentHeight, 0, 0);
+		headView.invalidate();
+		Log.v("@@@@@@", "width:" + headContentWidth + " height:"+ headContentHeight);
+		addHeaderView(headView, null, false);
+		setOnScrollListener(this);
+
+		animation = new RotateAnimation(0, -180,RotateAnimation.RELATIVE_TO_SELF, 0.5f,
+				RotateAnimation.RELATIVE_TO_SELF, 0.5f);
+		animation.setInterpolator(new LinearInterpolator());
+		animation.setDuration(250);
+		animation.setFillAfter(true);
+
+		reverseAnimation = new RotateAnimation(-180, 0,RotateAnimation.RELATIVE_TO_SELF, 0.5f,
+				RotateAnimation.RELATIVE_TO_SELF, 0.5f);
+		reverseAnimation.setInterpolator(new LinearInterpolator());
+		reverseAnimation.setDuration(200);
+		reverseAnimation.setFillAfter(true);
+
+		state = DONE;
+		isRefreshable = false;
+	}
+
+	public void onScroll(AbsListView arg0, int firstVisiableItem, int arg2,
+			int arg3) {
+		firstItemIndex = firstVisiableItem;
+	}
+	public void onScrollStateChanged(AbsListView arg0, int arg1) {
+	}
+
+	public boolean onTouchEvent(MotionEvent event) {
+		if (isRefreshable) {
+			switch (event.getAction()) {
+			case MotionEvent.ACTION_DOWN:
+				if (firstItemIndex == 0 && !isRecored) {
+					isRecored = true;
+					startY = (int) event.getY();
+					Log.v("@@@@@@", "ACTION_DOWN 这是第  "+i+++"步" +1 );
+				}
+				break;
+			case MotionEvent.ACTION_UP:
+				if (state != REFRESHING && state != LOADING) {
+					if (state == DONE) {
+					}
+					if (state == PULL_To_REFRESH) {
+						state = DONE;
+						Log.v("@@@@@@", "ACTION_UP PULL_To_REFRESH and changeHeaderViewByState()" +
+								" 这是第  "+i+++"步前"+2 );
+						changeHeaderViewByState();
+						Log.v("@@@@@@", "ACTION_UP PULL_To_REFRESH and changeHeaderViewByState() " +
+								"这是第  "+i+++"步后"+2 );
+					}
+					if (state == RELEASE_To_REFRESH) {
+						state = REFRESHING;
+						Log.v("@@@@@@", "ACTION_UP RELEASE_To_REFRESH changeHeaderViewByState() " +
+								"这是第  "+i+++"步" +3);
+						changeHeaderViewByState();						
+						onRefresh();
+						Log.v("@@@@@@", "ACTION_UP RELEASE_To_REFRESH changeHeaderViewByState()" +
+								" 这是第  "+i+++"步" +3);
+					}
+				}
+				isRecored = false;
+				isBack = false;
+				break;
+			case MotionEvent.ACTION_MOVE:
+				int tempY = (int) event.getY();
+				if (!isRecored && firstItemIndex == 0) {
+					isRecored = true;
+					startY = tempY;
+					Log.v("@@@@@@", "ACTION_MOVE 这是第  "+i+++"步" +4);
+				}
+				if (state != REFRESHING && isRecored && state != LOADING) {
+					if (state == RELEASE_To_REFRESH) {
+						setSelection(0);
+						if (((tempY - startY) / RATIO < headContentHeight)
+								&& (tempY - startY) > 0) {
+							state = PULL_To_REFRESH;
+							changeHeaderViewByState();
+							Log.v("@@@@@@", "changeHeaderViewByState() 这是第  "+i+++"步"+5 );
+						}
+						else if (tempY - startY <= 0) {
+							state = DONE;
+							changeHeaderViewByState();
+							Log.v("@@@@@@", "ACTION_MOVE RELEASE_To_REFRESH 2  changeHeaderViewByState " +
+									"这是第  "+i+++"步" +6);
+						}
+					}
+					if (state == PULL_To_REFRESH) {
+						setSelection(0);
+						if ((tempY - startY) / RATIO >= headContentHeight) {
+							state = RELEASE_To_REFRESH;
+							isBack = true;
+							Log.v("@@@@@@", "changeHeaderViewByState " +
+									"这是第  "+i+++"步前"+7 );
+							changeHeaderViewByState();
+							Log.v("@@@@@@", "changeHeaderViewByState " +
+									"这是第  "+i+++"步后"+7 );
+						}
+						else if (tempY - startY <= 0) {
+							state = DONE;
+							changeHeaderViewByState();
+							Log.v("@@@@@@", "ACTION_MOVE changeHeaderViewByState PULL_To_REFRESH 2" +
+									" 这是第  "+i+++"步" +8);
+						}
+					}
+					if (state == DONE) {
+						if (tempY - startY > 0) {
+							state = PULL_To_REFRESH;
+							Log.v("@@@@@@", "ACTION_MOVE DONE changeHeaderViewByState " +
+									"这是第  "+i+++"步前" +9);
+							changeHeaderViewByState();
+							Log.v("@@@@@@", "ACTION_MOVE DONE changeHeaderViewByState " +
+									"这是第  "+i+++"步后" +9);
+						}
+					}
+					if (state == PULL_To_REFRESH) {
+						headView.setPadding(0, -1 * headContentHeight+(tempY - startY) / RATIO, 0, 0);
+						Log.v("@@@@@@", -1 * headContentHeight+(tempY - startY) / RATIO+
+								"ACTION_MOVE PULL_To_REFRESH 3  这是第  "+i+++"步"+10 );
+					}
+					if (state == RELEASE_To_REFRESH) {
+						headView.setPadding(0, (tempY - startY) / RATIO- headContentHeight, 0, 0);
+						Log.v("@@@@@@", "ACTION_MOVE PULL_To_REFRESH 4 这是第  "+i+++"步" +11);
+					}
+				}
+				break;
+			}
+		}
+		return super.onTouchEvent(event);
+	}
+
+	private void changeHeaderViewByState() {
+		switch (state) {
+		case RELEASE_To_REFRESH:
+			arrowImageView.setVisibility(View.VISIBLE);
+			progressBar.setVisibility(View.GONE);
+			tipsTextview.setVisibility(View.VISIBLE);
+			lastUpdatedTextView.setVisibility(View.VISIBLE);
+			arrowImageView.clearAnimation();
+			arrowImageView.startAnimation(animation);
+			tipsTextview.setText("请释放 刷新");
+			Log.v("@@@@@@", "RELEASE_To_REFRESH 这是第  "+i+++"步"+12 +"请释放 刷新" );
+			break;
+		case PULL_To_REFRESH:
+			progressBar.setVisibility(View.GONE);
+			tipsTextview.setVisibility(View.VISIBLE);
+			lastUpdatedTextView.setVisibility(View.VISIBLE);
+			arrowImageView.clearAnimation();
+			arrowImageView.setVisibility(View.VISIBLE);
+			if (isBack) {
+				isBack = false;
+				arrowImageView.clearAnimation();
+				arrowImageView.startAnimation(reverseAnimation);
+				//tipsTextview.setText("isBack  is true ！！！");
+			} else {
+				//tipsTextview.setText("isBack  is false ！！！");
+			}
+			Log.v("@@@@@@", "PULL_To_REFRESH 这是第  "+i+++"步" +13+
+					"  changeHeaderViewByState()");
+			break;
+		case REFRESHING:
+			headView.setPadding(0, 0, 0, 0);
+			progressBar.setVisibility(View.VISIBLE);
+			arrowImageView.clearAnimation();
+			arrowImageView.setVisibility(View.GONE);
+			tipsTextview.setText("正在加载中 ...");
+			lastUpdatedTextView.setVisibility(View.VISIBLE);
+			Log.v("@@@@@@", "REFRESHING 这是第  "+i+++"步" +"正在加载中 ...REFRESHING");
+			break;
+		case DONE:
+			headView.setPadding(0, -1 * headContentHeight, 0, 0);
+			progressBar.setVisibility(View.GONE);
+			arrowImageView.clearAnimation();
+			arrowImageView.setImageResource(R.drawable.arrow);
+			tipsTextview.setText("已经加载完毕 ");
+			lastUpdatedTextView.setVisibility(View.VISIBLE);
+			Log.v("@@@@@@", "DONE 这是第  "+i+++"步" +"已经加载完毕- DONE ");
+			break;
+		}
+	}
+
+	public void setonRefreshListener(OnRefreshListener refreshListener) {
+		this.refreshListener = refreshListener;
+		isRefreshable = true;
+	}
+
+	public interface OnRefreshListener {
+		public void onRefresh();
+	}
+
+	public void onRefreshComplete() {
+		state = DONE;
+		lastUpdatedTextView.setText("已加载完成: " + new Date().toLocaleString());
+		changeHeaderViewByState();
+		Log.v("@@@@@@", "onRefreshComplete() 被调用。。。");
+	}
+
+	private void onRefresh() {
+		if (refreshListener != null) {
+			refreshListener.onRefresh();			
+			Log.v("@@@@@@", "onRefresh被调用，这是第  "+i+++"步" );
+		}
+	}
+
+	private void measureView(View child) {
+		ViewGroup.LayoutParams p = child.getLayoutParams();
+		if (p == null) {
+			p = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT);
+		}
+		int childWidthSpec = ViewGroup.getChildMeasureSpec(0, 0 + 0, p.width);
+		int lpHeight = p.height;
+		int childHeightSpec;
+		if (lpHeight > 0) {
+			childHeightSpec = MeasureSpec.makeMeasureSpec(lpHeight,MeasureSpec.EXACTLY);
+		} else {
+			childHeightSpec = MeasureSpec.makeMeasureSpec(0,MeasureSpec.UNSPECIFIED);
+		}
+		child.measure(childWidthSpec, childHeightSpec);
+	}
+
+	public void setAdapter(BaseAdapter adapter) {
+		lastUpdatedTextView.setText("已加载完成:" + new Date().toLocaleString());
+		super.setAdapter(adapter);
+	}
+}
\ No newline at end of file
diff --git a/src/BWP/MobileSale/UpdateService.java b/src/BWP/MobileSale/UpdateService.java
new file mode 100644
index 0000000..d05f547
--- /dev/null
+++ b/src/BWP/MobileSale/UpdateService.java
@@ -0,0 +1,78 @@
+package BWP.MobileSale;
+
+import org.forks.jsonrpc.JsonRpcException;
+import org.forks.jsonrpc.RpcFacade;
+import BWP.MobileSale.Util.ConfigUtil;
+import BWP.MobileSale.Util.StringUtil;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.IBinder;
+
+public class UpdateService extends Service {
+
+	class CheckUpdateTask extends  AsyncTask<Void, Void, Void>{
+		@Override
+		protected Void doInBackground(Void... params) {
+			try {
+				CheckUpdate();
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			return null;
+		}
+		
+	}
+	
+	private void CheckUpdate() throws JsonRpcException {
+		NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+		manager.cancel("MobileSaler", 0);
+		if(StringUtil.IsNullOrEmpty(ConfigUtil.getServerUri(this))){
+			return;
+		}
+		
+		String method = "/Sale/Sale/Rpcs/MobileSaleClientRpc/GetAndroidClientVerion";
+		Long serverVersion = RpcFacade.rpcCall(method);
+		if (serverVersion != Utils.CurrentVersion) {
+			
+			Intent intent = new Intent(this,ClientUpdateActivity.class);
+			PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
+			Notification notification = new Notification();
+			notification.icon = R.drawable.ic_launcher;
+			notification.setLatestEventInfo(this, "管理系统有不同客户端更新,点击下载", 
+					String.format("当前:%s,服务器:%s",Utils.CurrentVersion,serverVersion), pendingIntent);
+			manager.notify("MobileSaler", 0, notification);	
+		}
+	}
+	
+	@Override
+	public IBinder onBind(Intent arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void onCreate() {
+		// TODO Auto-generated method stub
+		super.onCreate();
+	}
+
+	@Override
+	public void onDestroy() {
+		// TODO Auto-generated method stub
+		super.onDestroy();
+	}
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		new  CheckUpdateTask().execute();
+		return super.onStartCommand(intent, flags, startId);
+	}
+
+
+
+}
diff --git a/src/BWP/MobileSale/UserBuyerStarCommand.java b/src/BWP/MobileSale/UserBuyerStarCommand.java
new file mode 100644
index 0000000..970e8ca
--- /dev/null
+++ b/src/BWP/MobileSale/UserBuyerStarCommand.java
@@ -0,0 +1,44 @@
+package BWP.MobileSale;
+
+import java.io.Serializable;
+
+import org.forks.jsonrpc.RpcFacade;
+
+public class UserBuyerStarCommand implements CommandService.Command,Serializable {
+	private static final long serialVersionUID = 1L;
+	Long mBuyerID;
+	Boolean mStared;
+	
+	public UserBuyerStarCommand(Long buyerID, Boolean stared){
+		mBuyerID = buyerID;
+		mStared = stared;
+	}
+	
+	public void Execute() throws Exception {
+		if(mStared){
+			AddBuyer();
+		}else{
+			RemoveBuyer();
+		}
+		
+	}
+
+	String addMethod = "/Sale/Sale/Rpcs/MobileOrder_User_BuyerRpc/Add";
+	String removeMethod = "/Sale/Sale/Rpcs/MobileOrder_User_Buyerrpc/Remove";
+	
+	private void RemoveBuyer() throws Exception {
+		RpcFacade.rpcCall(removeMethod, mBuyerID);
+		
+	}
+
+	private void AddBuyer() throws Exception {
+		RpcFacade.rpcCall(addMethod, mBuyerID);
+		
+	}
+
+	public String getName() {
+		// TODO Auto-generated method stub
+		return "收藏客户";
+	}
+
+}
diff --git a/src/BWP/MobileSale/UserGoodsStarCommand.java b/src/BWP/MobileSale/UserGoodsStarCommand.java
new file mode 100644
index 0000000..932bba6
--- /dev/null
+++ b/src/BWP/MobileSale/UserGoodsStarCommand.java
@@ -0,0 +1,41 @@
+package BWP.MobileSale;
+
+import org.forks.jsonrpc.RpcFacade;
+
+public class UserGoodsStarCommand implements CommandService.Command {
+
+	Long mGoodsID;
+	Boolean mStarred;
+	public UserGoodsStarCommand(Long goodsID,Boolean starred){
+		mGoodsID = goodsID;
+		mStarred = starred;
+	}
+	
+	public void Execute() throws Exception {
+		if(mStarred){
+			AddGoods();
+		}else{
+			RemoveGoods();
+		}
+		
+	}
+
+	String addMethod = "/Sale/Sale/Rpcs/MobileOrder_User_GoodsRpc/Add";
+	String removeMethod = "/Sale/Sale/Rpcs/MobileOrder_User_GoodsRpc/Remove";
+	
+	private void RemoveGoods() throws Exception {
+		RpcFacade.rpcCall(removeMethod, mGoodsID);
+		
+	}
+
+	private void AddGoods() throws Exception {
+		RpcFacade.rpcCall(addMethod, mGoodsID);
+		
+	}
+
+	public String getName() {
+		// TODO Auto-generated method stub
+		return "收藏存货";
+	}
+
+}
diff --git a/src/BWP/MobileSale/UserMessageActivity.java b/src/BWP/MobileSale/UserMessageActivity.java
new file mode 100644
index 0000000..83dcf01
--- /dev/null
+++ b/src/BWP/MobileSale/UserMessageActivity.java
@@ -0,0 +1,121 @@
+package BWP.MobileSale;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.DFDataTable;
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Order.OrderEditActivity;
+import BWP.MobileSale.Order.OrderListActivity;
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.CallableTask;
+import BWP.MobileSale.Util.DateTimeUtil;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.SimpleAdapter.ViewBinder;
+
+public class UserMessageActivity extends LoginedActivity {
+	ListView listView;
+	SimpleAdapter adapter;
+	List<RpcObject> list;
+	Button btn;
+	public UserMessageActivity() {
+		// TODO Auto-generated constructor stub
+	}
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.usermassage);
+		btn = (Button) findViewById(R.id.Button_Return);
+		btn.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		initListView();
+		StartQuery();
+		
+	}
+	
+	@Override
+	protected void onResume() {
+		// TODO Auto-generated method stub
+		StartQuery();
+		super.onResume();
+	}
+
+	private void StartQuery() {
+		searchTask.execute();
+	}
+	
+	String[] columnNames = new String[]{"ID","Message_SentTime","Message_Sender","Message_Category"};
+	
+	int[] columnIDs = new int[]{R.id.TextViewID,R.id.TextView_SentTime,R.id.TextView_Sender,R.id.TextView_Category};
+	
+	CallableTask searchTask = new CallableTask(this, "查询中...") {
+		public Object call() throws Exception {
+			String method = "/MainSystem/MainSystem/Rpcs/MessageRpc/GetList";
+			list = RpcFacade.rpcCall(method,false);			
+			adapter = new SimpleAdapter(UserMessageActivity.this, list,
+			R.layout.usermessage_list_item, columnNames,columnIDs);
+			adapter.setViewBinder(viewBinder);
+			return null;
+		}
+		
+		@Override
+		protected void successUI() {
+			listView.setAdapter(adapter);
+		}
+	};
+	
+	ViewBinder viewBinder = new ViewBinder() {
+		public boolean setViewValue(View view, Object data,
+				String textRepresentation) {
+			if (view.getId() == R.id.TextView_SentTime) {
+				((TextView)view).setText(DateTimeUtil.FormatDate((Date) data));
+				return true;
+			}
+			else{
+				return false;
+			}
+		}
+	};
+	
+	private void initListView() {
+		listView = ActivityUtil.Find(this, R.id.userMessageListView);
+		listView.setOnItemClickListener(new OnItemClickListener() {
+
+			@SuppressWarnings("unchecked")
+			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+					long arg3) {
+				HashMap<String, Object> map = (HashMap<String, Object>)arg0.getItemAtPosition(arg2);
+				Intent intent = new Intent();
+				long id = (Long) map.get("ID");
+				intent.putExtra("ID", id);
+				intent.setClass(arg1.getContext(), UserMessageDetailActivity.class);
+
+
+				startActivity(intent);
+			}
+
+		});
+	}
+
+}
diff --git a/src/BWP/MobileSale/UserMessageDetailActivity.java b/src/BWP/MobileSale/UserMessageDetailActivity.java
new file mode 100644
index 0000000..c1c0b44
--- /dev/null
+++ b/src/BWP/MobileSale/UserMessageDetailActivity.java
@@ -0,0 +1,71 @@
+package BWP.MobileSale;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import org.forks.jsonrpc.RpcFacade;
+import org.forks.jsonrpc.RpcObject;
+
+import BWP.MobileSale.Util.ActivityUtil;
+import BWP.MobileSale.Util.DateTimeUtil;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class UserMessageDetailActivity extends Activity {
+	
+	private TextView text_sender,text_senderTime,text_category,text_content;
+	private Button btn;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.usermassage_detail);
+		
+		Intent intent = getIntent();
+		long billId = intent.getLongExtra("ID", 0);
+		String method = "/MainSystem/MainSystem/Rpcs/MessageRpc/GetByID";
+		RpcObject bill = RpcFacade.rpcCall(method,billId);
+		text_sender = (TextView)this.findViewById(R.id.TextView_Sender);
+		text_senderTime = (TextView)this.findViewById(R.id.TextView_SenderTime);
+		text_category = (TextView)this.findViewById(R.id.TextView_Category);
+		text_content = (TextView)this.findViewById(R.id.TextView_Content);
+		String sender = bill.getString("Message_Sender");
+		Date senderTime = bill.getDate("Message_SentTime");
+		String category = bill.getString("Message_Category");
+		String content = bill.getString("MessageTextContent");
+		if(sender!=null&&sender!=""){
+			text_sender.setText(sender);
+		}
+		if(senderTime!=null){
+			text_senderTime.setText(DateTimeUtil.FormatDate(senderTime));
+		}
+		if(category!=null&&category!=""){
+			text_category.setText(category);
+		}
+
+		if(content!=null&&content!=""){
+			text_content.setText(content);
+		}
+
+		
+		btn = (Button) findViewById(R.id.Button_Return);
+		btn.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				finish();
+			}
+		});
+		
+		
+		String method2 = "/MainSystem/MainSystem/Rpcs/MessageRpc/MarkRead";
+		RpcFacade.rpcCall(method2,bill.getLong("Message_ID"));
+	}
+
+}
diff --git a/src/BWP/MobileSale/Util/ActivityUtil.java b/src/BWP/MobileSale/Util/ActivityUtil.java
new file mode 100644
index 0000000..8d19ea5
--- /dev/null
+++ b/src/BWP/MobileSale/Util/ActivityUtil.java
@@ -0,0 +1,46 @@
+package BWP.MobileSale.Util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class ActivityUtil {
+	public String GetText(Activity activity, int id) {
+		View view = activity.findViewById(id);
+		if (view instanceof EditText) {
+			return ((EditText) view).getText().toString();
+		}
+
+		return String.format("δ֧�ֵõ�����%s���ı�", view.getClass());
+	}
+
+	public static Button FindButton(Activity activity, int id) {
+		return (Button) activity.findViewById(id);
+	}
+
+	public void Go(Context context, Class<?> class1) {
+		Intent intent = new Intent();
+		intent.setClass(context, class1);
+		context.startActivity(intent);
+	}
+
+	public void Go(View arg0, Class<?> class1) {
+		Go(arg0.getContext(), class1);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <T extends View> T Find(Activity activity, int id) {
+		return (T) activity.findViewById(id);
+	}
+	
+	public static void Finish(Activity activity,Intent data){
+		activity.setResult(Activity.RESULT_OK,data);
+		activity.finish();
+	}
+
+	
+	
+}
diff --git a/src/BWP/MobileSale/Util/CallableTask.java b/src/BWP/MobileSale/Util/CallableTask.java
new file mode 100644
index 0000000..14f5f46
--- /dev/null
+++ b/src/BWP/MobileSale/Util/CallableTask.java
@@ -0,0 +1,106 @@
+package BWP.MobileSale.Util;
+
+import java.util.concurrent.Callable;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+public abstract class CallableTask implements Callable<Object> {
+	final String tag = "CallableTask";
+	
+	Boolean mIsRunning = false;
+	
+	protected abstract void successUI();
+	
+	void failUI(Exception e){
+		if(e.getMessage() == "Cancel"){
+			return;
+		}
+		Log.e(tag, e.getMessage(), e);
+		DialogUtil.Alert(mContext, e.getMessage());
+	}
+	
+	
+	
+	Context mContext;
+	ProgressDialog mDialog;
+	String mMessage;
+	
+	public CallableTask(Context context,String message){
+		mContext = context;
+		mMessage = message;
+	}
+	
+	public final void execute(){
+		if(mIsRunning){
+			Log.w(tag, "重复执行");
+			return;
+		}
+		this.mIsRunning = true;
+		new Task().execute();
+	}
+	
+	class Task extends AsyncTask<Void, Void, Void>{
+		Exception mException;
+		@Override
+		protected Void doInBackground(Void... params) {
+			try{
+				mIsRunning = true;
+				call();
+			}catch(Exception ex){
+				mException = ex;
+				cancel(false);
+			}
+			return null;
+		}
+
+		@Override
+		protected void onCancelled() {
+			super.onCancelled();
+			endExecute();
+			failUI(mException);
+		}
+
+		@Override
+		protected void onPostExecute(Void result) {
+			super.onPostExecute(result);
+			endExecute();
+			successUI();
+		}
+
+		public void endExecute() {
+			if(mDialog != null){
+				mDialog.dismiss();
+			}
+			mIsRunning = false;
+			
+		}
+		
+		@Override
+		protected void onPreExecute() {
+			super.onPreExecute();
+			mDialog = ProgressDialog.show(mContext , "请稍等",mMessage,true,true,
+					new OnCancelListener() {
+				
+				@Override
+				public void onCancel(DialogInterface dialog) {
+					// TODO Auto-generated method stub
+					mException = new Exception("Cancel");
+					cancel(true);
+				}
+			}
+					
+					);
+		}
+		
+		
+
+	}
+
+}
diff --git a/src/BWP/MobileSale/Util/ConfigUtil.java b/src/BWP/MobileSale/Util/ConfigUtil.java
new file mode 100644
index 0000000..c173202
--- /dev/null
+++ b/src/BWP/MobileSale/Util/ConfigUtil.java
@@ -0,0 +1,30 @@
+package BWP.MobileSale.Util;
+
+import BWP.MobileSale.Config.ConfigBase;
+import BWP.MobileSale.Config.ServerConfig;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+public class ConfigUtil {
+	public static <T extends ConfigBase> void Fill(T config) {
+		SharedPreferences store = config.getStore();
+		config.GetValues(store);
+	}
+
+	public static <T extends ConfigBase> void Save(T config) {
+		SharedPreferences store = config.getStore();
+		Editor editor = store.edit();
+		editor.clear();
+		config.SetValues(editor);
+		editor.commit();
+	}
+	
+	
+	public static String getServerUri(Context context){
+		ServerConfig config =new ServerConfig(context);
+		Fill(config);
+		return config.getServerUri();
+	}
+	
+}
diff --git a/src/BWP/MobileSale/Util/ContextUtil.java b/src/BWP/MobileSale/Util/ContextUtil.java
new file mode 100644
index 0000000..a58c381
--- /dev/null
+++ b/src/BWP/MobileSale/Util/ContextUtil.java
@@ -0,0 +1,10 @@
+package BWP.MobileSale.Util;
+
+import android.content.Context;
+
+public class ContextUtil {
+	static Context current;
+	public void setContext(Context context){
+		current = context;
+	}
+}
diff --git a/src/BWP/MobileSale/Util/DateTimeUtil.java b/src/BWP/MobileSale/Util/DateTimeUtil.java
new file mode 100644
index 0000000..32c1220
--- /dev/null
+++ b/src/BWP/MobileSale/Util/DateTimeUtil.java
@@ -0,0 +1,48 @@
+package BWP.MobileSale.Util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+public final class DateTimeUtil {
+	static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+	
+	public static Date ParseDate(String dateStr) throws ParseException{
+		return dateFormat.parse(dateStr);
+	}
+	
+	public static Date SafeParseDate(String dateStr){
+		try {
+			if(StringUtil.IsNullOrEmpty(dateStr)){
+				return new Date();
+			}
+			return ParseDate(dateStr);
+		} catch (ParseException e) {
+			return new Date();
+		}
+	}
+	
+	public static Calendar SafeParseCalendar(String dateStr){
+		Calendar calendar = Calendar.getInstance(Locale.getDefault());
+		calendar.setTime(SafeParseDate(dateStr));
+		return calendar;
+	}
+
+	public static String FormatDate(Calendar calendar) {
+		return dateFormat.format(calendar.getTime());
+	}
+	
+	public static String FormatDate(Date date){
+		if(date == null){
+			return "";
+		}
+		return dateFormat.format(date);
+	}
+
+	public static Date RemoveTime(Date time) {
+		return SafeParseDate(FormatDate(time));
+	}
+
+}
diff --git a/src/BWP/MobileSale/Util/DbUtil.java b/src/BWP/MobileSale/Util/DbUtil.java
new file mode 100644
index 0000000..9b3af58
--- /dev/null
+++ b/src/BWP/MobileSale/Util/DbUtil.java
@@ -0,0 +1,23 @@
+package BWP.MobileSale.Util;
+import BWP.MobileSale.Config.SaleDataBase;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+public class DbUtil {
+	public boolean TableExists(SQLiteDatabase db, String tableName) {
+		Cursor c = db.rawQuery(
+				"select * from sqlite_master where table=? limit 0,1",
+				new String[] { tableName });
+		return c.getCount() > 0;
+	}
+
+	public SQLiteDatabase getWritableDatabase(Context context) {
+		return SaleDataBase.getWritableDatabase(context);
+	}
+
+	public SQLiteDatabase getReadableDatabase(Context context) {
+		return SaleDataBase.getReadableDatabase(context);
+	}
+
+}
diff --git a/src/BWP/MobileSale/Util/DialogUtil.java b/src/BWP/MobileSale/Util/DialogUtil.java
new file mode 100644
index 0000000..b740c79
--- /dev/null
+++ b/src/BWP/MobileSale/Util/DialogUtil.java
@@ -0,0 +1,483 @@
+
+package BWP.MobileSale.Util;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.concurrent.Callable;
+ 
+import BWP.MobileSale.R; 
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.DialogInterface; 
+import android.os.Handler; 
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.view.View;
+import android.view.View.OnClickListener; 
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.LinearLayout; 
+import android.widget.TableRow;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.view.LayoutInflater;
+
+public class DialogUtil {
+	
+	
+	
+	abstract static class ProgressDialogHelper {
+		Context mContext;
+		String mMessage;
+		Callable<?> mRunnable;
+		Handler mHandler = new Handler();
+		
+		Callable<?> mCallableAfterSuccess;
+		
+		public void setCallableAfterSuccess(Callable<?> callable){
+			mCallableAfterSuccess = callable;
+		}
+		
+		public ProgressDialogHelper(Context context,String message,Callable<?> runnable){
+			this.mContext = context;
+			this.mMessage = message;
+			this.mRunnable = runnable;
+		}
+		
+		ProgressDialog mDialog;
+		
+		public void Start(){
+			mDialog = ProgressDialog.show(mContext, "请稍等", mMessage, true);
+			Thread thread = new Thread(){
+				@Override
+				public void run(){
+					try{
+						mRunnable.call();
+					}
+					catch(Exception ex){
+						ex.printStackTrace();
+						Runnable runnable = new Runnable(){
+
+							public void run() {
+								DialogUtil.Alert(mContext, mMessage);
+								
+							}
+							
+							String mMessage;
+							public Runnable setMessage(String message){
+								mMessage = message;
+								return this;
+							}
+							
+						}.setMessage(ex.getMessage());
+						mHandler.post(runnable);
+					}
+					finally{
+						mDialog.dismiss();
+					}
+				}
+				
+			};
+			thread.start();
+		}
+	}
+	
+	
+	public static void Progress(Context context,String message,Callable<?> callable){
+		new ProgressDialogHelper(context, message, callable){	
+		}
+		.Start();
+	}
+	
+	public static void Progress(Context context,String message,Callable<?> callable,Callable<?> callableAfterSuccess){
+		ProgressDialogHelper helper = new ProgressDialogHelper(context, message, callable){	
+		};
+		
+		helper.Start();
+
+	}
+	
+	
+	public  static void Alert(Context context, String message) {
+		new AlertDialog.Builder(context).setMessage(message)
+				.setPositiveButton("确定", null).show();
+	}
+	
+	public  static void AlertAndFinish(final Activity activity, String message) {
+		new AlertDialog.Builder(activity).setMessage(message)
+				.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int which) {
+						activity.finish();
+					}
+					
+				}).show();
+	}
+	
+
+	public static void Alert(View view, String message) {
+		Alert(view.getContext(), message);
+	}
+
+	public static void AutoHiddenAlert(Context context, String message) {
+		Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+	}
+
+	public static void AutoHiddenAlert(View view, String message) {
+		AutoHiddenAlert(view.getContext(), message);
+	}
+	
+	public interface SetDate{
+		void setDate(Date date);
+	}
+	
+	public static void AddSelectDateDialog(TextView arg0,final SetDate onsetdate) {
+		arg0.setOnClickListener(new OnClickListener(){
+
+			public void onClick(final View view) {
+				final TextView textView = (TextView) view;
+				OnDateSetListener onDateSetListener = new DatePickerDialog.OnDateSetListener(){
+
+					public void onDateSet(DatePicker datePicker, int year, int month,
+							int day) {
+						Calendar calendar = Calendar.getInstance();
+						calendar.set(year, month, day);
+						textView.setText(DateTimeUtil.FormatDate(calendar));
+						onsetdate.setDate(calendar.getTime());
+					}
+					
+				};
+				
+				String dateStr = textView.getText().toString();
+				Calendar calendar = DateTimeUtil.SafeParseCalendar(dateStr);
+				
+				new DatePickerDialog(
+						view.getContext(), 
+						onDateSetListener, 
+						calendar.get(Calendar.YEAR),
+						calendar.get(Calendar.MONTH),
+						calendar.get(Calendar.DAY_OF_MONTH)).show();
+			}
+			
+		});
+	}
+	
+	
+	public static void Prompt(Context context,String title,String message,String inputValue,int inputType, final OnPromptListener onprompt){
+		final EditText input = new EditText(context);
+		input.setText(inputValue);
+		input.setInputType(inputType);
+		Builder builder = new AlertDialog.Builder(context);
+		builder.setTitle(title)
+			.setMessage(message)
+			.setView(input)
+			.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+				
+				public void onClick(DialogInterface arg0, int arg1) {
+					String prompt = input.getText().toString();
+					onprompt.OnPrompt(prompt);
+				}
+			})
+			.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+				
+				public void onClick(DialogInterface dialog, int which) {
+					
+				}
+			}).show();
+		
+	}
+	
+	public final class BatchNoSelect implements View.OnClickListener{
+
+		@Override
+		public void onClick(View v) {
+			
+			
+			
+		}
+	}
+
+	public static void PromptWithTwoInput(final Context context,final String title,String message,HashMap<String,Object> lastData,final boolean isOrNotShowSecond,boolean isOrNotShowPolicyPrice,boolean hasEditPriceRole, final OnPromptListener onprompt){
+		
+		LayoutInflater inflater = (LayoutInflater) context.getSystemService(context.LAYOUT_INFLATER_SERVICE);
+		final View view;
+	    
+		view = inflater.inflate(R.layout.edittext, null);
+		TextView goodsPolicyPrice = (TextView)view.findViewById(R.id.goodsPolicyPrice);
+		if(!hasEditPriceRole){
+			TableRow row = (TableRow)view.findViewById(R.id.tableRow2);
+			row.setVisibility(view.GONE);
+		}
+		if(isOrNotShowPolicyPrice){
+			BigDecimal PolicyPrice = (BigDecimal)lastData.get("PolicyPrice");
+			if(PolicyPrice.compareTo(new BigDecimal(0)) == 1){
+				goodsPolicyPrice.setText(PolicyPrice.toString());
+			}
+		}else{
+			TableRow row = (TableRow)view.findViewById(R.id.tableRow3);
+			row.setVisibility(view.GONE);
+		}
+		
+		
+		final EditText goodsNum = (EditText)view.findViewById(R.id.goodsNum);
+		goodsNum.setText(StringUtil.ToString(lastData.get("Number")));
+		final EditText goodsSecondNum = (EditText)view.findViewById(R.id.goodsSecondNum);
+	
+		if(title != "请输入数量"){
+			EditText goodsPrice = (EditText)view.findViewById(R.id.goodsPrice);
+			goodsPrice.setText(StringUtil.ToString(lastData.get("Price")));
+		}
+		if(isOrNotShowSecond){
+			goodsSecondNum.setText(StringUtil.ToString(lastData.get("SecondNumber")));
+			final Object leftRatio =  lastData.get("LeftRatio");
+			final Object rightRatio =  lastData.get("RightRatio");
+			final Object goods_SecondaryUnit1RelativeRatio =  lastData.get("Goods_SecondaryUnit1RelativeRatio");
+			final Object goods_SecondaryUnit1Ratio =  lastData.get("Goods_SecondaryUnit1Ratio");
+			if(leftRatio!=null&&rightRatio!=null&&goods_SecondaryUnit1RelativeRatio!=null&&goods_SecondaryUnit1Ratio!=null){
+			final BigDecimal rightRatio2 =  (BigDecimal)rightRatio;
+			final BigDecimal leftRatio2 =  (BigDecimal)leftRatio;
+			final BigDecimal goods_SecondaryUnit1RelativeRatio2 =  (BigDecimal)goods_SecondaryUnit1RelativeRatio;
+			final BigDecimal goods_SecondaryUnit1Ratio2 =  (BigDecimal)goods_SecondaryUnit1Ratio;
+			goodsNum.addTextChangedListener(
+					new TextWatcher() {
+						
+						@Override
+						public void onTextChanged(CharSequence s, int start, int before, int count) {
+							if(goodsNum.hasFocus()){
+							BigDecimal number =  StringUtil.ParseMoney(s.toString());
+							
+							if(number!=null&&goods_SecondaryUnit1Ratio2!=null&&goods_SecondaryUnit1RelativeRatio2!=null){
+								BigDecimal mainUnitNum = ((number).divide(leftRatio2,6,BigDecimal.ROUND_HALF_EVEN)).multiply(rightRatio2);
+								BigDecimal secondNumber = (mainUnitNum.multiply(goods_SecondaryUnit1RelativeRatio2)).divide(goods_SecondaryUnit1Ratio2,6,BigDecimal.ROUND_HALF_EVEN);
+								goodsSecondNum.setText(secondNumber.toString());
+								
+							}
+							}
+							
+						}
+						
+						@Override
+						public void beforeTextChanged(CharSequence s, int start, int count,
+								int after) {
+							// TODO Auto-generated method stub
+							
+						}
+						
+						@Override
+						public void afterTextChanged(Editable s) {
+							
+							
+						}
+					}
+					);
+			
+			goodsSecondNum.addTextChangedListener(
+					new TextWatcher() {
+						
+						@Override
+						public void onTextChanged(CharSequence s, int start, int before, int count) {
+							if(goodsSecondNum.hasFocus()){
+							BigDecimal secondNumber =  StringUtil.ParseMoney(s.toString());
+							if(secondNumber!=null&&goods_SecondaryUnit1Ratio2!=null&&goods_SecondaryUnit1RelativeRatio!=null){
+								BigDecimal mainUnitNum = ((secondNumber).multiply(goods_SecondaryUnit1Ratio2)).divide(goods_SecondaryUnit1RelativeRatio2);
+								BigDecimal number = (mainUnitNum.divide(rightRatio2)).multiply(leftRatio2);
+								goodsNum.setText(number.toString());
+							}
+							}
+						}
+						
+						@Override
+						public void beforeTextChanged(CharSequence s, int start, int count,
+								int after) {
+							// TODO Auto-generated method stub
+							
+						}
+						
+						@Override
+						public void afterTextChanged(Editable s) {
+							
+							
+						}
+					}
+					);
+		}
+		}else {
+			goodsSecondNum.setVisibility(view.GONE);
+			TextView textView_Second = (TextView)view.findViewById(R.id.TextView_SecondNum);
+			textView_Second.setVisibility(view.GONE);
+		}
+		Builder builder = new AlertDialog.Builder(context);
+		builder.setTitle(title)
+			.setMessage(message)
+			.setView(view)
+			.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+				
+				public void onClick(DialogInterface arg0, int arg1) {
+					EditText goodsNum = (EditText)view.findViewById(R.id.goodsNum);
+					EditText goodsSecondNum = (EditText)view.findViewById(R.id.goodsSecondNum);
+					HashMap<String, Object> returnlist = new HashMap<String, Object>();
+					if(title != "请输入数量"){
+					EditText goodsPrice = (EditText)view.findViewById(R.id.goodsPrice);
+					returnlist.put("goodsNum",StringUtil.ParseMoney( goodsNum.getText().toString()));
+					returnlist.put("goodsPrice", StringUtil.ParseMoney(goodsPrice.getText().toString()));
+					if(isOrNotShowSecond){
+					returnlist.put("goodsSecondNum", StringUtil.ParseMoney( goodsSecondNum.getText().toString()));
+					}
+					onprompt.OnPrompt2(returnlist);
+					}else{
+						returnlist.put("goodsNum", StringUtil.ParseMoney(goodsNum.getText().toString()));
+						if(isOrNotShowSecond){
+						returnlist.put("goodsSecondNum", StringUtil.ParseMoney( goodsSecondNum.getText().toString()));
+						}
+						onprompt.OnPrompt2(returnlist);	
+				}
+			}})
+			.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+				
+				public void onClick(DialogInterface dialog, int which) {
+					
+				}
+			}).show();
+		
+	}
+	
+	public static void Confirm(Context context,String title,String trueString,String falseString,DialogInterface.OnClickListener onConfirm){
+		new AlertDialog.Builder(context)
+		.setTitle(title)
+		.setPositiveButton(trueString, onConfirm)
+		.setNegativeButton(falseString, null).show();
+	}
+	
+	static String hadletype="";
+	public static void PromptGoods(Context context, String title, String num,
+			 String hadleType, final OnPromptGoodsListener onprompt) throws Exception {
+
+		hadletype=hadleType;
+		
+		String message = "输入数字类型字符";
+		int inputType = InputType.TYPE_NUMBER_FLAG_DECIMAL;
+		LinearLayout linearLayout = new LinearLayout(context);
+		linearLayout.setOrientation(LinearLayout.VERTICAL);
+
+		LinearLayout line1 = new LinearLayout(context);
+		line1.setOrientation(LinearLayout.HORIZONTAL);
+		final TextView view1 = new TextView(context);
+		view1.setText("数量:");
+		view1.setLayoutParams(new LinearLayout.LayoutParams(
+				LinearLayout.LayoutParams.WRAP_CONTENT,
+				LinearLayout.LayoutParams.WRAP_CONTENT));
+		final EditText edit1 = new EditText(context);
+		edit1.setInputType(inputType);
+		edit1.setLayoutParams(new LinearLayout.LayoutParams(
+				LinearLayout.LayoutParams.MATCH_PARENT,
+				LinearLayout.LayoutParams.WRAP_CONTENT));
+
+		line1.addView(view1);
+		line1.addView(edit1);
+
+//		LinearLayout line2 = new LinearLayout(context);
+//		line2.setOrientation(LinearLayout.HORIZONTAL);
+//		TextView view2 = new TextView(context);
+//		view2.setText("价格:");
+//		view2.setLayoutParams(new LinearLayout.LayoutParams(
+//				LinearLayout.LayoutParams.WRAP_CONTENT,
+//				LinearLayout.LayoutParams.WRAP_CONTENT));
+//		final EditText edit2 = new EditText(context);
+//		edit1.setInputType(inputType);
+//		edit2.setLayoutParams(new LinearLayout.LayoutParams(
+//				LinearLayout.LayoutParams.MATCH_PARENT,
+//				LinearLayout.LayoutParams.WRAP_CONTENT));
+//		line2.addView(view2);
+//		line2.addView(edit2);
+
+//		LinearLayout line3 = new LinearLayout(context);
+//		line3.setOrientation(LinearLayout.HORIZONTAL);
+//
+//		TextView view3 = new TextView(context);
+//		view3.setText("方式:");
+//
+//		view3.setLayoutParams(new LinearLayout.LayoutParams(
+//				LinearLayout.LayoutParams.WRAP_CONTENT,
+//				LinearLayout.LayoutParams.WRAP_CONTENT));
+//
+//		Spinner spinner = new Spinner(context);
+//		ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
+//				context, R.array.planets_array,
+//				android.R.layout.simple_spinner_item);
+//		adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+//		spinner.setPrompt("选择退货处理方式");
+//
+//		spinner.setLayoutParams(new LinearLayout.LayoutParams(
+//				LinearLayout.LayoutParams.MATCH_PARENT,
+//				LinearLayout.LayoutParams.WRAP_CONTENT));
+//
+//		spinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+//
+//			public void onItemSelected(AdapterView<?> arg0, View arg1,
+//					int position, long id) {
+//				String itemValue = arg0.getItemAtPosition(position).toString();
+//				hadletype = itemValue;				
+//			}
+//
+//			public void onNothingSelected(AdapterView<?> arg0) {
+//				
+//			}
+//
+//		});
+//		spinner.setAdapter(adapter);
+//
+//		line3.addView(view3);
+		//line3.addView(spinner);
+
+		linearLayout.addView(line1);
+//		linearLayout.addView(line2);
+		//linearLayout.addView(line3);
+
+		edit1.setText(num);
+//		edit2.setText(price);
+//		if(hadleType=="")
+//		{
+//			spinner.setSelection(0);
+//		}
+//		else if(hadleType.equals("退货拉回"))
+//		{
+//			spinner.setSelection(1);
+//		}
+//		else if(hadleType.equals("丢弃或销毁"))
+//		{
+//			spinner.setSelection(2);
+//		}
+//		else
+//		{
+//			throw new Exception("不存在退货处理方式："+hadleType);
+//		}
+		
+		
+		Builder builder = new AlertDialog.Builder(context);
+		builder.setTitle(title).setMessage(message).setView(linearLayout)
+				.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+
+					public void onClick(DialogInterface arg0, int arg1) {
+
+						String num = edit1.getText().toString();
+//						String price = edit2.getText().toString();
+
+						onprompt.OnPrompt(num,  hadletype);
+						//System.out.println("数量："+num+"---价格："+price+"--处理方式："+hadletype);
+					}
+				})
+				.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+
+					public void onClick(DialogInterface dialog, int which) {
+
+					}
+				}).show();
+
+	}
+}
diff --git a/src/BWP/MobileSale/Util/MobileUtil.java b/src/BWP/MobileSale/Util/MobileUtil.java
new file mode 100644
index 0000000..e87b28b
--- /dev/null
+++ b/src/BWP/MobileSale/Util/MobileUtil.java
@@ -0,0 +1,11 @@
+package BWP.MobileSale.Util;
+
+import android.content.Context;
+import android.telephony.TelephonyManager;
+
+public class MobileUtil {
+	public static String GetPhoneNumber(Context context){
+        TelephonyManager tm = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
+        return tm.getLine1Number();
+	}
+}
diff --git a/src/BWP/MobileSale/Util/OnPromptGoodsListener.java b/src/BWP/MobileSale/Util/OnPromptGoodsListener.java
new file mode 100644
index 0000000..c52d30f
--- /dev/null
+++ b/src/BWP/MobileSale/Util/OnPromptGoodsListener.java
@@ -0,0 +1,4 @@
+package BWP.MobileSale.Util;
+public interface OnPromptGoodsListener {
+	public void OnPrompt(String num,String hadleType);
+}
diff --git a/src/BWP/MobileSale/Util/OnPromptListener.java b/src/BWP/MobileSale/Util/OnPromptListener.java
new file mode 100644
index 0000000..1816865
--- /dev/null
+++ b/src/BWP/MobileSale/Util/OnPromptListener.java
@@ -0,0 +1,8 @@
+package BWP.MobileSale.Util;
+
+import java.util.HashMap;
+
+public interface OnPromptListener {
+	public void OnPrompt(String prompt);
+	public void OnPrompt2(HashMap<String, Object> prompt);
+}
diff --git a/src/BWP/MobileSale/Util/StringUtil.java b/src/BWP/MobileSale/Util/StringUtil.java
new file mode 100644
index 0000000..8a1c9bb
--- /dev/null
+++ b/src/BWP/MobileSale/Util/StringUtil.java
@@ -0,0 +1,33 @@
+package BWP.MobileSale.Util;
+
+import java.math.BigDecimal;
+
+import android.content.Context;
+
+public class StringUtil {
+	public static Boolean IsNullOrEmpty(String s) {
+		return s == null || s.length() == 0;
+	}
+
+	public String GetResource(Context context, int resId) {
+		return context.getString(resId);
+	}
+	
+	public static String ToString(Object object){
+		if(object == null){
+			return "";
+		}
+		return String.format("%s", object);
+	}
+
+	
+	public static BigDecimal ParseMoney(String strValue)
+	{
+		if(IsNullOrEmpty(strValue))
+		{
+			return null;
+		}
+		return new BigDecimal(strValue);
+	}
+
+}
diff --git a/src/BWP/MobileSale/Util/ViewOnClickTask.java b/src/BWP/MobileSale/Util/ViewOnClickTask.java
new file mode 100644
index 0000000..5d18652
--- /dev/null
+++ b/src/BWP/MobileSale/Util/ViewOnClickTask.java
@@ -0,0 +1,36 @@
+package BWP.MobileSale.Util;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+public abstract class ViewOnClickTask extends CallableTask implements
+		OnClickListener {
+
+	private String mPrompt;
+
+	public ViewOnClickTask(Context context, String message) {
+		super(context, message);
+	}
+
+	public void setPrompt(String prompt) {
+		mPrompt = prompt;
+	}
+
+	public void onClick(View v) {
+
+		if (!StringUtil.IsNullOrEmpty(mPrompt)) {
+			DialogUtil.Confirm(v.getContext(), mPrompt, "确定", "取消",
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							ViewOnClickTask.this.execute();
+						}
+					});
+		} else {
+			super.execute();
+		}
+
+	}
+
+}
diff --git a/src/BWP/MobileSale/Util/WebUtil.java b/src/BWP/MobileSale/Util/WebUtil.java
new file mode 100644
index 0000000..3c24a06
--- /dev/null
+++ b/src/BWP/MobileSale/Util/WebUtil.java
@@ -0,0 +1,12 @@
+package BWP.MobileSale.Util;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+
+public class WebUtil {
+	public void View(Activity activity, String uri) {
+		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
+		activity.startActivity(intent);
+	}
+}
diff --git a/src/BWP/MobileSale/Utils.java b/src/BWP/MobileSale/Utils.java
new file mode 100644
index 0000000..60877b3
--- /dev/null
+++ b/src/BWP/MobileSale/Utils.java
@@ -0,0 +1,15 @@
+package BWP.MobileSale;
+
+import BWP.MobileSale.Util.*;
+public class Utils {
+
+	public static long CurrentVersion = 2016110818 ;
+
+	public static DialogUtil DialogUtil = new DialogUtil();
+	public static StringUtil StringUtil = new StringUtil();
+	public static WebUtil WebUtil = new WebUtil();
+	public static ActivityUtil ActivityUtil = new ActivityUtil();
+	public static ConfigUtil ConfigUtil = new ConfigUtil();
+	public static DbUtil DbUtil = new DbUtil();
+}
+
diff --git a/src/BWP/widget/SelectSimpleAdapter.java b/src/BWP/widget/SelectSimpleAdapter.java
new file mode 100644
index 0000000..9af69a4
--- /dev/null
+++ b/src/BWP/widget/SelectSimpleAdapter.java
@@ -0,0 +1,66 @@
+package BWP.widget;
+
+import java.util.List;
+import java.util.Map;
+
+import org.forks.jsonrpc.RpcFacade;
+
+import BWP.MobileSale.R;
+import android.R.bool;
+import android.content.Context;
+import android.graphics.Color;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnCreateContextMenuListener;
+import android.view.ViewGroup;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
+
+public class SelectSimpleAdapter extends SimpleAdapter {
+	
+	int mSelectedPosition=-1;
+	boolean isOrNotShowSecond;
+	public void setSelect(int position){
+		mSelectedPosition = position;
+	}
+
+	public SelectSimpleAdapter(Context context,
+			List<? extends Map<String, ?>> data, int resource, String[] from,
+			int[] to) {
+		super(context, data, resource, from, to);
+		String method = "/Sale/Sale/Rpcs/MobileOrderRpc/CheckIsOrNotShowSecond";
+		isOrNotShowSecond = RpcFacade.rpcCall(method);
+	}
+
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		Log.i("SelectSimpleAdapter",String.format("position:%s",position));
+		
+		Log.i("SelectSimpleAdapter", String.format("view:%s", convertView));
+		
+		View result = super.getView(position, convertView, parent);
+		if(!isOrNotShowSecond){
+			TextView aaTextView = (TextView)result.findViewById(R.id.SecondNumber);
+			if(aaTextView!=null){
+			aaTextView.setVisibility(View.INVISIBLE);
+			}
+		}
+		SetBackground(position,result);
+		return result;
+	}
+
+	private void SetBackground(int position, View convertView) {
+		if(convertView == null){
+			return;
+		}
+		if(position == mSelectedPosition){
+			convertView.setBackgroundColor(Color.DKGRAY);
+		}else{
+			convertView.setBackgroundColor(Color.TRANSPARENT);
+		}
+		
+	}
+	
+	
+
+}