BWP
/
MobileSale-Eclipse
7
0
Fork 0
Code Issues 0 Pull Requests 0 Activity
Browse Source

需求单No.136139

master
robin 8 years ago
parent
52812468f9
commit
7de2fe0e2c
8 changed files with 275 additions and 156 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      PublishKey/MobileSale.apk
  2. BIN
      PublishKey/PublishKey
  3. +1
    -0
      PublishKey/password
  4. +86
    -83
      gen/BWP/MobileSale/R.java
  5. +28
    -17
      res/layout/order_edit.xml
  6. +69
    -48
      res/layout/order_edit_detail_list_item.xml
  7. +90
    -7
      src/BWP/MobileSale/Order/OrderEditActivity.java
  8. +1
    -1
      src/BWP/MobileSale/Utils.java

BIN
PublishKey/MobileSale.apk View File


BIN
PublishKey/PublishKey View File


+ 1
- 0
PublishKey/password View File

@ -0,0 +1 @@
bwp2011

+ 86
- 83
gen/BWP/MobileSale/R.java View File

@ -86,15 +86,15 @@ public final class R {
public static final int Button_Main_MobileAdjustGoodsBillEdit=0x7f0900aa; public static final int Button_Main_MobileAdjustGoodsBillEdit=0x7f0900aa;
public static final int Button_Main_MobileAdjustGoodsBillList=0x7f0900ab; public static final int Button_Main_MobileAdjustGoodsBillList=0x7f0900ab;
public static final int Button_Main_MobileAdjustGoodsBillSetUserProfile=0x7f0900ac; 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_Main_OrderEdit=0x7f0900d6;
public static final int Button_Main_OrderList=0x7f0900d7;
public static final int Button_Main_OrderProfileSet=0x7f0900d8;
public static final int Button_Main_RemainGoodsEdit=0x7f0900e0;
public static final int Button_Main_RemainGoodsList=0x7f0900e1;
public static final int Button_Main_ReturnEdit=0x7f0900f1;
public static final int Button_Main_ReturnList=0x7f0900f2;
public static final int Button_Main_ReturnSetUserProfile=0x7f0900f3;
public static final int Button_Main_saleoutstoreList=0x7f090109;
public static final int Button_NextPage=0x7f09006a; public static final int Button_NextPage=0x7f09006a;
public static final int Button_OK=0x7f090003; public static final int Button_OK=0x7f090003;
public static final int Button_Pay=0x7f090063; public static final int Button_Pay=0x7f090063;
@ -102,12 +102,12 @@ public final class R {
public static final int Button_PayProfileSet=0x7f090065; public static final int Button_PayProfileSet=0x7f090065;
public static final int Button_Refresh=0x7f0900a9; public static final int Button_Refresh=0x7f0900a9;
public static final int Button_Return=0x7f090066; 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_Save=0x7f09010a;
public static final int Button_Search=0x7f0900f5;
public static final int Button_SetUrl=0x7f090005; public static final int Button_SetUrl=0x7f090005;
public static final int Button_UpPage=0x7f090069; public static final int Button_UpPage=0x7f090069;
public static final int Button_branchordermain_Return=0x7f090044; public static final int Button_branchordermain_Return=0x7f090044;
public static final int BuyerName=0x7f0900db;
public static final int BuyerName=0x7f0900de;
public static final int CheckBox=0x7f090092; public static final int CheckBox=0x7f090092;
public static final int CheckBox_AutoSave=0x7f090002; public static final int CheckBox_AutoSave=0x7f090002;
public static final int CheckBox_Star=0x7f090061; public static final int CheckBox_Star=0x7f090061;
@ -116,85 +116,88 @@ public final class R {
public static final int EditText_Password=0x7f090001; public static final int EditText_Password=0x7f090001;
public static final int EditText_Price=0x7f0900b2; public static final int EditText_Price=0x7f0900b2;
public static final int EditText_Remark=0x7f09008d; public static final int EditText_Remark=0x7f09008d;
public static final int EditText_Search=0x7f0900f1;
public static final int EditText_Search=0x7f0900f4;
public static final int EditText_SecondNumber=0x7f0900b0; public static final int EditText_SecondNumber=0x7f0900b0;
public static final int EditText_Url=0x7f09000a; public static final int EditText_Url=0x7f09000a;
public static final int EditText_Username=0x7f090000; public static final int EditText_Username=0x7f090000;
public static final int Goods_Name=0x7f0900cc;
public static final int Goods_Name=0x7f0900ce;
public static final int LinearLayout=0x7f09000f; public static final int LinearLayout=0x7f09000f;
public static final int ListView=0x7f09006b; public static final int ListView=0x7f09006b;
public static final int Money=0x7f090105;
public static final int Number=0x7f0900cd;
public static final int Money=0x7f090108;
public static final int Number=0x7f0900d0;
public static final int Order_Button_Check=0x7f0900b9; public static final int Order_Button_Check=0x7f0900b9;
public static final int Order_Button_Date=0x7f0900c6;
public static final int Order_Button_Date=0x7f0900c8;
public static final int Order_Button_Delete=0x7f0900bb; public static final int Order_Button_Delete=0x7f0900bb;
public static final int Order_Button_LoadTQ=0x7f0900bc;
public static final int Order_Button_LoadTQ2=0x7f0900bd;
public static final int Order_Button_Return=0x7f0900b7; public static final int Order_Button_Return=0x7f0900b7;
public static final int Order_Button_Save=0x7f0900b8; 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_SelectAccountingUnit=0x7f0900c0;
public static final int Order_Button_SelectBuyer=0x7f0900c5;
public static final int Order_Button_SelectGoods=0x7f0900cd;
public static final int Order_Button_SelectRemark=0x7f0900cb;
public static final int Order_Button_SelectStore=0x7f0900c3;
public static final int Order_Button_UnCheck=0x7f0900ba; public static final int Order_Button_UnCheck=0x7f0900ba;
public static final int Order_EditText_Remark=0x7f0900c7;
public static final int Order_EditText_Remark=0x7f0900c9;
public static final int Order_ListView=0x7f0900a8; public static final int Order_ListView=0x7f0900a8;
public static final int Order_SetUser_Ruturn=0x7f09007a; public static final int Order_SetUser_Ruturn=0x7f09007a;
public static final int Order_SetUser_Save=0x7f09007c; 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 Order_TextView_AccountingUnit=0x7f0900bf;
public static final int Order_TextView_Balance=0x7f0900c7;
public static final int Order_TextView_BuyerCode=0x7f090106;
public static final int Order_TextView_BuyerName=0x7f0900c4;
public static final int Order_TextView_DetailCount=0x7f0900cc;
public static final int Order_TextView_Remark=0x7f0900ca;
public static final int Order_TextView_Store=0x7f0900c2;
public static final int Order_TextView_WrappageAllNum=0x7f090107;
public static final int Price=0x7f0900d2;
public static final int ProgressBar=0x7f090081; 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 Return_Button_Check=0x7f0900e3;
public static final int Return_Button_Date=0x7f0900e9;
public static final int Return_Button_Delete=0x7f0900e4;
public static final int Return_Button_SaleOutStore=0x7f0900e8;
public static final int Return_Button_Save=0x7f0900e2;
public static final int Return_Button_SelectBuyer=0x7f0900e6;
public static final int Return_Button_SelectGoods=0x7f0900ef;
public static final int Return_Button_SelectRemark=0x7f0900ec;
public static final int Return_EditText_Remark=0x7f0900ea;
public static final int Return_ListView=0x7f0900f0;
public static final int Return_SetUser_Ruturn=0x7f0900ff;
public static final int Return_SetUser_Save=0x7f090100;
public static final int Return_TextView_BuyerName=0x7f0900e5;
public static final int Return_TextView_DetailCount=0x7f0900ed;
public static final int Return_TextView_DetailNum=0x7f0900ee;
public static final int Return_TextView_Remark=0x7f0900eb;
public static final int Return_TextView_SaleOutStore=0x7f0900e7;
public static final int SaleOutStore_Button_Cancel=0x7f0900fa;
public static final int SaleOutStore_Button_OK=0x7f0900f9;
public static final int SaleOutStore_Button_Search=0x7f0900f7;
public static final int SaleOutStore_EditText_Search=0x7f0900f6;
public static final int SaleOutStore_ListView=0x7f0900f8;
public static final int SecondNumber=0x7f0900d1;
public static final int SelectAdjustInBuyer=0x7f0900a1; public static final int SelectAdjustInBuyer=0x7f0900a1;
public static final int SelectAdjustOutBuyer=0x7f09009f; public static final int SelectAdjustOutBuyer=0x7f09009f;
public static final int SelectBatchNo=0x7f09008f; public static final int SelectBatchNo=0x7f09008f;
public static final int SelectBuyer=0x7f0900dc;
public static final int SelectBuyer=0x7f0900df;
public static final int Spinner_BillStateFilter=0x7f090045; public static final int Spinner_BillStateFilter=0x7f090045;
public static final int Spinner_Filter=0x7f090046; public static final int Spinner_Filter=0x7f090046;
public static final int Spinner_OrderBy=0x7f0900d0;
public static final int Spinner_OrderBy=0x7f0900d3;
public static final int Spinner_suc=0x7f090068; public static final int Spinner_suc=0x7f090068;
public static final int TQNumber=0x7f0900cf;
public static final int TextView1=0x7f09006c; public static final int TextView1=0x7f09006c;
public static final int TextView2=0x7f09006f; public static final int TextView2=0x7f09006f;
public static final int TextView3=0x7f09006e; public static final int TextView3=0x7f09006e;
public static final int TextView6=0x7f09006d; public static final int TextView6=0x7f09006d;
public static final int TextViewID=0x7f09010d;
public static final int TextViewID=0x7f090110;
public static final int TextView_4=0x7f090070; public static final int TextView_4=0x7f090070;
public static final int TextView_5=0x7f090071; public static final int TextView_5=0x7f090071;
public static final int TextView_BillDate=0x7f090041; public static final int TextView_BillDate=0x7f090041;
public static final int TextView_BillState=0x7f0900d2;
public static final int TextView_BillState=0x7f0900d5;
public static final int TextView_Buyer=0x7f090042; public static final int TextView_Buyer=0x7f090042;
public static final int TextView_Category=0x7f09010b;
public static final int TextView_Category=0x7f09010e;
public static final int TextView_Code=0x7f090062; 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_Content=0x7f09010f;
public static final int TextView_Date=0x7f0900d4;
public static final int TextView_DiffReadyMoney=0x7f090040; public static final int TextView_DiffReadyMoney=0x7f090040;
public static final int TextView_Goods_Name=0x7f090098; public static final int TextView_Goods_Name=0x7f090098;
public static final int TextView_ID=0x7f09003f; public static final int TextView_ID=0x7f09003f;
@ -203,15 +206,15 @@ public final class R {
public static final int TextView_Progress=0x7f090080; public static final int TextView_Progress=0x7f090080;
public static final int TextView_SecondNum=0x7f090084; public static final int TextView_SecondNum=0x7f090084;
public static final int TextView_SecondNumber=0x7f0900af; 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_Sender=0x7f09010c;
public static final int TextView_SenderTime=0x7f09010d;
public static final int TextView_SentTime=0x7f090111;
public static final int TextView_TodayLoadMoney=0x7f090043; public static final int TextView_TodayLoadMoney=0x7f090043;
public static final int ViewFlipper1=0x7f090012; public static final int ViewFlipper1=0x7f090012;
public static final int accountingUnitUI=0x7f0900bc;
public static final int accountingUnitUI=0x7f0900be;
public static final int approvalStaffView=0x7f090016; public static final int approvalStaffView=0x7f090016;
public static final int approvalTitleView=0x7f090017; public static final int approvalTitleView=0x7f090017;
public static final int balanceLayout=0x7f0900c4;
public static final int balanceLayout=0x7f0900c6;
public static final int batchNoLayout=0x7f0900b4; public static final int batchNoLayout=0x7f0900b4;
public static final int branchorder_billdate=0x7f09001d; public static final int branchorder_billdate=0x7f09001d;
public static final int branchorder_btnreturn=0x7f090019; public static final int branchorder_btnreturn=0x7f090019;
@ -298,28 +301,28 @@ public final class R {
public static final int order_setuser_setCardType=0x7f09007e; public static final int order_setuser_setCardType=0x7f09007e;
public static final int order_setuser_setCerID=0x7f090076; public static final int order_setuser_setCerID=0x7f090076;
public static final int order_setuser_setCerType=0x7f09007f; 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_setOrderCarriageManner=0x7f0900dc;
public static final int order_setuser_setOrderFarePayer=0x7f0900dd;
public static final int order_setuser_setPayUserName=0x7f090075; 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_setSaleType=0x7f0900db;
public static final int order_setuser_setSystemSign=0x7f0900d9;
public static final int order_setuser_setTakeGoods_Type=0x7f0900da;
public static final int order_setuser_setaccountunit=0x7f090072; public static final int order_setuser_setaccountunit=0x7f090072;
public static final int order_setuser_sethheadoffice=0x7f090073; public static final int order_setuser_sethheadoffice=0x7f090073;
public static final int policyPriceLayout=0x7f0900b5; public static final int policyPriceLayout=0x7f0900b5;
public static final int priceLayout=0x7f0900b1; public static final int priceLayout=0x7f0900b1;
public static final int ranchorder_edit_ReturnBoxNumber=0x7f09003b; public static final int ranchorder_edit_ReturnBoxNumber=0x7f09003b;
public static final int remarkLayout=0x7f0900b3; 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 return_selectsaleoutstore_listview_check=0x7f0900fe;
public static final int return_selectsaleoutstore_listview_goodsname=0x7f0900fc;
public static final int return_selectsaleoutstore_listview_id=0x7f0900fb;
public static final int return_selectsaleoutstore_listview_price=0x7f0900fd;
public static final int return_setuser_setaccountunit=0x7f090104;
public static final int return_setuser_setdept=0x7f090101;
public static final int return_setuser_sethandletype=0x7f090105;
public static final int return_setuser_setreturntype=0x7f090103;
public static final int return_setuser_setstore=0x7f090102;
public static final int storeUI=0x7f0900c1;
public static final int sv=0x7f09000e; public static final int sv=0x7f09000e;
public static final int tableLayout1=0x7f090082; public static final int tableLayout1=0x7f090082;
public static final int tableRow1=0x7f090086; public static final int tableRow1=0x7f090086;
@ -328,7 +331,7 @@ public final class R {
public static final int tableRow3=0x7f09008a; public static final int tableRow3=0x7f09008a;
public static final int tableRow4=0x7f09008e; public static final int tableRow4=0x7f09008e;
public static final int tableRow5=0x7f09008c; public static final int tableRow5=0x7f09008c;
public static final int userMessageListView=0x7f090108;
public static final int userMessageListView=0x7f09010b;
} }
public static final class layout { public static final class layout {
public static final int activity_login=0x7f030000; public static final int activity_login=0x7f030000;


+ 28
- 17
res/layout/order_edit.xml View File

@ -39,19 +39,31 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="撤销" /> android:text="撤销" />
<Button <Button
android:id="@+id/Order_Button_Delete" android:id="@+id/Order_Button_Delete"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="删除" /> android:text="删除" />
<Button
android:id="@+id/Order_Button_LoadTQ"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="去年同期" />
<Button
android:id="@+id/Order_Button_LoadTQ2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="上周同期" />
</LinearLayout> </LinearLayout>
<LinearLayout
<LinearLayout
android:id="@+id/accountingUnitUI"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/accountingUnitUI"
android:visibility="gone"
>
android:visibility="gone" >
<TextView <TextView
android:id="@+id/Order_TextView_AccountingUnit" android:id="@+id/Order_TextView_AccountingUnit"
@ -65,14 +77,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="选择会计单位" /> android:text="选择会计单位" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/storeUI"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/storeUI"
android:visibility="gone"
>
android:visibility="gone" >
<TextView <TextView
android:id="@+id/Order_TextView_Store" android:id="@+id/Order_TextView_Store"
@ -86,9 +97,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="选择仓库" /> android:text="选择仓库" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content" >
@ -111,26 +121,27 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="选择" /> android:text="选择" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/balanceLayout" android:id="@+id/balanceLayout"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="客户往来余额:" android:text="客户往来余额:"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
<TextView
android:id="@+id/Order_TextView_Balance" android:id="@+id/Order_TextView_Balance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content" >


+ 69
- 48
res/layout/order_edit_detail_list_item.xml View File

@ -1,49 +1,70 @@
<?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>
<?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/Goods_Name"
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.12" />
<TextView
android:id="@+id/TQNumber"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_weight="1.0"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/Number"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:text="数量"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/SecondNumber"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:text="辅数量"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/Price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:text="单价"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/BatchNo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:text="批号"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout> </LinearLayout>

+ 90
- 7
src/BWP/MobileSale/Order/OrderEditActivity.java View File

@ -2,9 +2,11 @@ package BWP.MobileSale.Order;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -80,6 +82,7 @@ public class OrderEditActivity extends LoginedActivity {
private TextView textView_StoreName; private TextView textView_StoreName;
private long mBillID; private long mBillID;
private RpcObject mDmo; private RpcObject mDmo;
private List<RpcObject> mDetails;
private int selectedPosition = -1; private int selectedPosition = -1;
private boolean mEnableSave = true; private boolean mEnableSave = true;
@ -98,7 +101,8 @@ public class OrderEditActivity extends LoginedActivity {
private boolean isOrNotShowBalance; private boolean isOrNotShowBalance;
private boolean isOrNotShowSecond; private boolean isOrNotShowSecond;
private boolean isOrNotShowAccountingUnitAndStore; private boolean isOrNotShowAccountingUnitAndStore;
private boolean isEditSecond,isEditMain,showRemark;
private boolean isEditSecond,isEditMain,showRemark;
boolean enableSaleXiWangEnable = false;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -140,6 +144,11 @@ public class OrderEditActivity extends LoginedActivity {
showRemark = RpcFacade.rpcCall(method); showRemark = RpcFacade.rpcCall(method);
} catch (Exception e) { } catch (Exception e) {
}
try {
String method="/Sale/Sale/Rpcs/MobileSaleClientRpc/SaleXiWangEnable";
enableSaleXiWangEnable = RpcFacade.rpcCall(method);
} catch (Exception e) {
} }
} }
@ -227,7 +236,8 @@ public class OrderEditActivity extends LoginedActivity {
InitButtonCheck(); InitButtonCheck();
InitButtonUnCheck(); InitButtonUnCheck();
InitButtonDelete(); InitButtonDelete();
InitLoadTQSave();
InitLoadTQSave2();
InitListView(); InitListView();
InitRemark(); InitRemark();
@ -493,6 +503,7 @@ public class OrderEditActivity extends LoginedActivity {
} }
}); });
} }
//删除 //删除
@ -586,6 +597,7 @@ public class OrderEditActivity extends LoginedActivity {
} }
buttonSave.setOnClickListener(saveTask); buttonSave.setOnClickListener(saveTask);
} }
ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") { ViewOnClickTask saveTask = new ViewOnClickTask(this, "保存中...") {
public Object call() throws Exception { public Object call() throws Exception {
mDmo.setString("Remark", textViewRemark.getText().toString()); mDmo.setString("Remark", textViewRemark.getText().toString());
@ -611,6 +623,76 @@ public class OrderEditActivity extends LoginedActivity {
}; };
int type = 0;
private void InitLoadTQSave() {
Button buttonLoad = ActivityUtil.Find(this, R.id.Order_Button_LoadTQ);
if (!enableSaleXiWangEnable || mBillID > 0) {
buttonLoad.setVisibility(View.GONE);
}
buttonLoad. 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;
}
type = 0;
loadTQTask.execute();
}
});
}
private void InitLoadTQSave2() {
Button buttonLoad = ActivityUtil.Find(this, R.id.Order_Button_LoadTQ2);
if (!enableSaleXiWangEnable || mBillID > 0) {
buttonLoad.setVisibility(View.GONE);
}
buttonLoad.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;
}
type = 1;
loadTQTask.execute();
}
});
}
ViewOnClickTask loadTQTask = new ViewOnClickTask(this, "加载中...") {
public Object call() throws Exception {
String method = "/Sale/SaleXiWang/Rpcs/OrderRpc/GetLastOrderInfo";
ManyList details = mDmo.getManyList("Details");
mDetails = RpcFacade.rpcCall (method, mDmo.getLong("Buyer_ID"),mDmo.getDate("Date"),type ,details);
return null;
}
@Override
protected void successUI() {
ManyList details = mDmo.getManyList("Details");
details.clear();
for (RpcObject item : mDetails) {
details.add(item);
}
applyToUI();
}
};
private void applyToUI() { private void applyToUI() {
if (mDmo == null) { if (mDmo == null) {
DialogUtil.Alert(OrderEditActivity.this, "当前可编辑的对象为空"); DialogUtil.Alert(OrderEditActivity.this, "当前可编辑的对象为空");
@ -647,19 +729,20 @@ public class OrderEditActivity extends LoginedActivity {
if (number == null) { if (number == null) {
number = new BigDecimal(0); number = new BigDecimal(0);
} }
allMoney = allMoney.add(price.multiply(number));
allMoney = allMoney.add(price.multiply(number));
} }
textViewDetailCount.setText(String.format("%s￥%.2f", details.size(), textViewDetailCount.setText(String.format("%s￥%.2f", details.size(),
allMoney)); allMoney));
SelectSimpleAdapter adapter = new SelectSimpleAdapter( SelectSimpleAdapter adapter = new SelectSimpleAdapter(
OrderEditActivity.this, details, OrderEditActivity.this, details,
R.layout.order_edit_detail_list_item, new String[] { 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 });
"Goods_Name", "Number","SecondNumber", "Price","BatchNo_Name","LastInfo" }, new int[] {
R.id.Goods_Name, R.id.Number,R.id.SecondNumber, R.id.Price,R.id.BatchNo ,R.id.TQNumber });
adapter.setSelect(selectedPosition); adapter.setSelect(selectedPosition);
listView.setAdapter(adapter);
listView.setAdapter(adapter);
if (firstVisiblePosition == -1) { if (firstVisiblePosition == -1) {
firstVisiblePosition = details.size() - 1; firstVisiblePosition = details.size() - 1;
} else if (firstVisiblePosition > details.size() - 1) { } else if (firstVisiblePosition > details.size() - 1) {


+ 1
- 1
src/BWP/MobileSale/Utils.java View File

@ -3,7 +3,7 @@ package BWP.MobileSale;
import BWP.MobileSale.Util.*; import BWP.MobileSale.Util.*;
public class Utils { public class Utils {
public static long CurrentVersion = 2017062711 ;
public static long CurrentVersion = 2017082410 ;
public static DialogUtil DialogUtil = new DialogUtil(); public static DialogUtil DialogUtil = new DialogUtil();
public static StringUtil StringUtil = new StringUtil(); public static StringUtil StringUtil = new StringUtil();


Write Preview
Loading…
Cancel
Save