diff --git a/res/layout/order_edit_detail_list_item.xml b/res/layout/order_edit_detail_list_item.xml index 34471cd..4f618b2 100644 --- a/res/layout/order_edit_detail_list_item.xml +++ b/res/layout/order_edit_detail_list_item.xml @@ -69,7 +69,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1.0" - android:text="单价" + android:text="" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/res/layout/saleoutstore_list_item.xml b/res/layout/saleoutstore_list_item.xml index ea755b2..149b52f 100644 --- a/res/layout/saleoutstore_list_item.xml +++ b/res/layout/saleoutstore_list_item.xml @@ -31,7 +31,7 @@ android:id="@+id/TextView2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="TextView" + android:text="" android:textAppearance="?android:attr/textAppearanceLarge" /> list1 = new ArrayList(); + List list2 = new ArrayList(); + list1.add("Goods_Name"); + list1.add("Number"); + list1.add("SecondNumber"); + list2.add(R.id.Goods_Name); + list2.add(R.id.Number); + list2.add(R.id.SecondNumber); + if (isShowPrice) { + list1.add("Price"); + list2.add(R.id.Price); + } + list1.add("BatchNo_Name"); + list1.add("LastYearInfo"); + list1.add("LastWeekInfo"); + list2.add(R.id.BatchNo); + list2.add(R.id.TQNumber); + list2.add(R.id.TQNumber2); + String[] fields = new String[list1.size()] ; + int[] v = new int[list1.size()] ; + for (int i = 0, j = list1.size(); i < j; i++) { + fields[i] = list1.get(i); + } + for (int i = 0, j = list2.size(); i < j; i++) { + v[i] = list2.get(i); + } + SelectSimpleAdapter adapter = new SelectSimpleAdapter( OrderEditActivity.this, details, - R.layout.order_edit_detail_list_item, new String[] { - "Goods_Name", "Number","SecondNumber", "Price","BatchNo_Name","LastYearInfo" ,"LastWeekInfo"}, new int[] { - R.id.Goods_Name, R.id.Number,R.id.SecondNumber, R.id.Price,R.id.BatchNo ,R.id.TQNumber ,R.id.TQNumber2}); + R.layout.order_edit_detail_list_item, fields, v); adapter.setSelect(selectedPosition); - + listView.setAdapter(adapter); if (firstVisiblePosition == -1) { firstVisiblePosition = details.size() - 1; diff --git a/src/BWP/MobileSale/Order/OrderListActivity.java b/src/BWP/MobileSale/Order/OrderListActivity.java index 0fa2e6c..a905905 100644 --- a/src/BWP/MobileSale/Order/OrderListActivity.java +++ b/src/BWP/MobileSale/Order/OrderListActivity.java @@ -38,12 +38,17 @@ import android.widget.TextView; public class OrderListActivity extends LoginedActivity { int pageCount = 0; - boolean flag = false; + boolean flag = false; + private boolean isShowMoney; @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { // TODO Auto-generated method stub super.onActivityResult(requestCode, resultCode, data); - + try { + String method = "/Sale/Sale/Rpcs/MobileOrderRpc/ShowMoney"; + isShowMoney = RpcFacade.rpcCall(method); + } catch (Exception e) { + } switch(requestCode){ case OrderEditActivity.RequestCode_Open: StartQuery(false); @@ -75,18 +80,17 @@ public class OrderListActivity extends LoginedActivity { } }; - 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); + if (isShowMoney) + return String.format("共%s条记录,%s元", RowCount, Money); + return String.format("共%s条记录", RowCount); } - + } SumInfo mSumInfo = new SumInfo(); @@ -99,19 +103,32 @@ public class OrderListActivity extends LoginedActivity { 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 rows = table.getRows(); mSumInfo.Money = new BigDecimal(0); - for(RpcObject row:rows){ - mSumInfo.Money = mSumInfo.Money.add(row.getMoney("Money")); + String[] columnNames = new String[0] ; + int[] columnIDs = new int[0] ; + if (isShowMoney) { + for (RpcObject row : rows) { + mSumInfo.Money = mSumInfo.Money.add(row.getMoney("Money")); + } + columnNames = new String[] { "ID", "Money", "Buyer_Name", + "Date", "BillState" }; + columnIDs = new int[] { R.id.TextView1, R.id.TextView2, + R.id.TextView3, R.id.TextView_Date, + R.id.TextView_BillState }; + } else { + columnNames = new String[] { "ID" , "Buyer_Name", + "Date", "BillState" }; + columnIDs = new int[] { R.id.TextView1 , + R.id.TextView3, R.id.TextView_Date, + R.id.TextView_BillState }; + } + mSumInfo.RowCount =0; + for (RpcObject row : rows) { + mSumInfo.RowCount =mSumInfo.RowCount+1; } adapter = new SimpleAdapter(OrderListActivity.this, rows, R.layout.order_list_item, columnNames,columnIDs); diff --git a/src/BWP/MobileSale/SaleOutStore/SaleOutStoreEditActivity.java b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreEditActivity.java index d145578..dd8d534 100644 --- a/src/BWP/MobileSale/SaleOutStore/SaleOutStoreEditActivity.java +++ b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreEditActivity.java @@ -1,10 +1,12 @@ package BWP.MobileSale.SaleOutStore; import java.math.BigDecimal; +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 java.util.Map.Entry; import org.forks.jsonrpc.ManyList; @@ -74,7 +76,8 @@ public class SaleOutStoreEditActivity extends LoginedActivity { String detailSearchKey; private int firstVisiblePosition; private Button btnReturn; - + private boolean isShowMoney; + private boolean isShowPrice; //private boolean isOrNotShowSecond; @Override @@ -84,7 +87,16 @@ public class SaleOutStoreEditActivity extends LoginedActivity { Intent intent = getIntent(); mBillID = intent.getLongExtra("ID", 0); btnReturn = (Button) this.findViewById(R.id.Order_Button_Return); - + try { + String method = "/Sale/Sale/Rpcs/SaleOutStoreRpc/ShowMoney"; + isShowMoney = RpcFacade.rpcCall(method); + } catch (Exception e) { + } + try { + String method = "/Sale/Sale/Rpcs/SaleOutStoreRpc/ShowPrice"; + isShowPrice = RpcFacade.rpcCall(method); + } catch (Exception e) { + } btnReturn.setOnClickListener(new OnClickListener() { @Override @@ -208,17 +220,41 @@ public class SaleOutStoreEditActivity extends LoginedActivity { allNum = allNum.add(number); allMoney = allMoney.add(price.multiply(number)); } - - textViewDetailCount.setText(String.format("%s￥ %.2f,%.2f", details.size(), - allMoney,allNum)); - + String s="%s"; + if (isShowMoney) + s=s+"￥ %.2f"; + if(isShowPrice){ + s=s+",%.2f"; + } + + textViewDetailCount.setText(String.format(s, details.size(), allMoney,allNum)); + + + List list1 = new ArrayList(); + List list2 = new ArrayList(); + list1.add("Goods_Name"); + list1.add("UnitNum"); + list2.add(R.id.Goods_Name); + list2.add(R.id.Number); + if (isShowPrice) { + list1.add("Price"); + list2.add(R.id.Price); + } + if (isShowMoney) { + list1.add("Money"); + list2.add(R.id.Money); + } + String[] fields = new String[list1.size()] ; + int[] v = new int[list1.size()] ; + for (int i = 0, j = list1.size(); i < j; i++) { + fields[i] = list1.get(i); + } + for (int i = 0, j = list2.size(); i < j; i++) { + v[i] = list2.get(i); + } 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 }); + R.layout.saleoutstore_edit_detail_list_item,fields, v); adapter.setSelect(selectedPosition); listView.setAdapter(adapter); if (firstVisiblePosition == -1) { diff --git a/src/BWP/MobileSale/SaleOutStore/SaleOutStoreListActivity.java b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreListActivity.java index 975879f..ab10248 100644 --- a/src/BWP/MobileSale/SaleOutStore/SaleOutStoreListActivity.java +++ b/src/BWP/MobileSale/SaleOutStore/SaleOutStoreListActivity.java @@ -2,6 +2,7 @@ package BWP.MobileSale.SaleOutStore; import java.math.BigDecimal; import java.text.ParseException; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -39,11 +40,16 @@ public class SaleOutStoreListActivity extends LoginedActivity { int pageCount = 0; boolean flag = false; + private boolean isShowMoney; @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { // TODO Auto-generated method stub super.onActivityResult(requestCode, resultCode, data); - + try { + String method = "/Sale/Sale/Rpcs/SaleOutStoreRpc/ShowMoney"; + isShowMoney = RpcFacade.rpcCall(method); + } catch (Exception e) { + } switch(requestCode){ case SaleOutStoreEditActivity.RequestCode_Open: StartQuery(false); @@ -74,17 +80,15 @@ public class SaleOutStoreListActivity extends LoginedActivity { } } }; - - 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); + if (isShowMoney) + return String.format("共%s条记录,%s元", RowCount, Money); + return String.format("共%s条记录", RowCount); } } @@ -104,9 +108,35 @@ public class SaleOutStoreListActivity extends LoginedActivity { DFDataTable table = RpcFacade.rpcCall(method, argument); List rows = table.getRows(); mSumInfo.Money = new BigDecimal(0); - for(RpcObject row:rows){ - mSumInfo.Money = mSumInfo.Money.add(row.getMoney("Money")); + + + List list1 = new ArrayList(); + List list2 = new ArrayList(); + list1.add("ID"); + list2.add(R.id.TextView1); + if (isShowMoney) { + list1.add("Money"); + list2.add(R.id.TextView2); + } + list1.add("Buyer_Name"); + list1.add("Date"); + list1.add("BillState"); + list2.add(R.id.TextView3); + list2.add(R.id.TextView_Date); + list2.add(R.id.TextView_BillState); + String[] columnNames = new String[list1.size()] ; + int[] columnIDs = new int[list2.size()] ; + for (int i = 0, j = list1.size(); i < j; i++) { + columnNames[i] = list1.get(i); + } + for (int i = 0, j = list2.size(); i < j; i++) { + columnIDs[i] = list2.get(i); } + mSumInfo.RowCount =0; + for (RpcObject row : rows) { + mSumInfo.RowCount =mSumInfo.RowCount+1; + } + adapter = new SimpleAdapter(SaleOutStoreListActivity.this, rows, R.layout.saleoutstore_list_item, columnNames,columnIDs); adapter.setViewBinder(viewBinder); diff --git a/src/BWP/MobileSale/Utils.java b/src/BWP/MobileSale/Utils.java index ab90959..224d051 100644 --- a/src/BWP/MobileSale/Utils.java +++ b/src/BWP/MobileSale/Utils.java @@ -3,7 +3,7 @@ package BWP.MobileSale; import BWP.MobileSale.Util.*; public class Utils { - public static long CurrentVersion = 2017091410 ; + public static long CurrentVersion = 2018012010 ; public static DialogUtil DialogUtil = new DialogUtil(); public static StringUtil StringUtil = new StringUtil();