1.修改bug

2.//todo  回款管理的客户接口

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialFreezeActivity.java

@@ -73,6 +73,7 @@ public class WorkFinancialFreezeActivity extends WorkToolBarActivity {
         param.put("id", info.getId());
         tvDepPrice.setText(MathUtils.converData(info.getBalance(), 3));
         tvName.setText(info.getName());
+        WorkUtils.addDecimalsListener(etPrice);
         changeView();
     }
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialReceiveTicketAddActivity.java

@@ -62,7 +62,7 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
         typeDialog.addItems(typeList, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                chooseType = WorkUtils.getOrderCode(typeList[which]);
+                chooseType =typeList[which];
                 tvOrder.setText(typeList[which]);
                 dialog.dismiss();
                 if (!hasAddPermission()){
@@ -132,8 +132,8 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
                 startActivityForResult(WorkChooseDepActivity.class, 10003);
                 break;
             case R.id.rl_client:
-                startActivityForResult(StoreSaleClientActivity.class, 10002,
-                        "depId", depId + "", "flag", "1", "code", "SUPPLIER", "supplier", "选择供应商");
+                startActivityForResult(StoreSaleClientActivity.class, 10002
+                        , "flag", "1", "code", "SUPPLIER", "supplier", "选择供应商");
                 break;
         }
     }
@@ -158,11 +158,11 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
     private boolean hasAddPermission() {
         boolean hasPermission = false;
         if (TextUtils.equals(chooseType, "供应订单")) {
-            if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_SAVE.getPermission())) {
+            if (WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_SAVE.getPermission())) {
                 hasPermission = true;
             }
         } else if (TextUtils.equals(chooseType, "外采购订单")) {
-            if (!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_SAVE.getPermission())) {
+            if (WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_SAVE.getPermission())) {
                 hasPermission = true;
             }
         }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialTicketAddActivity.java

@@ -14,6 +14,7 @@ import com.wd.workoffice.bean.event.CheckTicketEvent;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
 import com.wd.workoffice.util.DialogUtils;
+import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -62,7 +63,7 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
         typeDialog.addItems(typeList, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                chooseType = WorkUtils.getOrderCode(typeList[which]);
+                chooseType = typeList[which];
                 tvOrder.setText(typeList[which]);
                 dialog.dismiss();
                 if (!hasAddPermission()){
@@ -133,8 +134,8 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
                 startActivityForResult(WorkChooseDepActivity.class, 10003);
                 break;
             case R.id.rl_client:
-                startActivityForResult(StoreSaleClientActivity.class, 10001,
-                        "flag","1","code", "CUSTOMER");
+                startActivityForResult(StoreSaleClientActivity.class, 10001
+                        ,"code", "CUSTOMER","depId", UserKeeper.getInstance().getUserDepId());
                 break;
         }
     }
@@ -159,19 +160,19 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
     private boolean hasAddPermission() {
         boolean hasPermission = false;
         if (TextUtils.equals(chooseType, "销售订单")) {
-            if (!WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_SAVE.getPermission())) {
+            if (WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_SAVE.getPermission())) {
                 hasPermission = true;
             }
         } else if (TextUtils.equals(chooseType, "组装订单")) {
-            if (!WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_SAVE.getPermission())) {
+            if (WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_SAVE.getPermission())) {
                 hasPermission = true;
             }
         }else if (TextUtils.equals(chooseType, "外采购订单")) {
-            if (!WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_SAVE.getPermission())) {
+            if (WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_SAVE.getPermission())) {
                 hasPermission = true;
             }
         } else if (TextUtils.equals(chooseType, "坩埚订单")) {
-            if (!WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_SAVE.getPermission())) {
+            if (WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_SAVE.getPermission())) {
                 hasPermission = true;
             }
         }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkLogisticsDetailActivity.java

@@ -91,7 +91,7 @@ public class WorkLogisticsDetailActivity extends WorkToolBarActivity {
         tvReceiveDep.setText(info.getReceiveDeptName());
         tvProcess.setText(WorkUtils.getOrderName(info.getProcessCode()));
         tvLogisticsPrice.setText(MathUtils.converData(info.getApplyAmount(),3));
-        tvWeight.setText(String.valueOf(info.getTotalWeight()));
+        tvWeight.setText(MathUtils.converData(info.getTotalWeight(),3));
         tvLocation.setText(info.getDistributionSite());
         tvTicket.setText(info.getIssuingUnit());
         tvCode.setText(info.getInvoiceNumber());

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseOrderDetailActivity.java

@@ -22,7 +22,7 @@ import flexible.xd.android_base.network.rtfhttp.Transformer;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 工作台 - 部门 -订单详情
+ * 工作台 - 仓库 -订单详情
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd

app/src/main/java/com/wd/workoffice/ui/adapter/WorkContactsInfoAdapter.java

@@ -21,7 +21,7 @@ public class WorkContactsInfoAdapter extends BaseQuickAdapter<ContactsBean.PartT
 
     @Override
     protected void convert(BaseViewHolder helper,ContactsBean.PartTypeRelListBean item) {
-        helper.setText(R.id.tv_first_contact_type, item.getTransitPartType());
+        helper.setText(R.id.tv_first_contact_type, item.getTransitPartTypeName());
         helper.setText(R.id.tv_first_dep, item.getDeptName());
         helper.setText(R.id.tv_first_person, item.getAccountName());
         helper.setText(R.id.tv_level, "类别".concat(MathUtils.conver(helper.getAdapterPosition()+1)));

app/src/main/java/com/wd/workoffice/ui/adapter/WorkFinancialReceiveTicketAdapter.java

@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.TicketBean;
+import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.List;
@@ -23,11 +24,11 @@ public class WorkFinancialReceiveTicketAdapter extends BaseQuickAdapter<TicketBe
     @Override
     protected void convert(BaseViewHolder helper, TicketBean.RecordsBean item) {
         helper.setText(R.id.tv_name, item.getSupplierName());
-        helper.setText(R.id.tv_tax, String.valueOf(item.getTax()));
+        helper.setText(R.id.tv_tax, MathUtils.converData(item.getTax(),3));
         helper.setText(R.id.tv_person, item.getApplierName());
         helper.setText(R.id.tv_time, item.getCreatedTime());
         helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
-        helper.setText(R.id.tv_all_price, String.valueOf(item.getInvoiceSum()));
+        helper.setText(R.id.tv_all_price, MathUtils.converData(item.getInvoiceSum(),3));
     }
 }
 

app/src/main/java/com/wd/workoffice/ui/adapter/WorkFlowAdapter.java

@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.FlowBean;
 import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.util.MathUtils;
 
 import java.util.List;
 
@@ -25,7 +26,7 @@ public class WorkFlowAdapter extends BaseQuickAdapter<FlowBean.RecordsBean, Base
     @Override
     protected void convert(BaseViewHolder helper, FlowBean.RecordsBean item) {
 //        helper.setText(R.id.tv_price,(TextUtils.equals("支出", item.getTypeName()) ? "-" : "+") +  String.valueOf(item.getMoney()));
-        helper.setText(R.id.tv_price,String.valueOf(item.getMoney()));
+        helper.setText(R.id.tv_price, MathUtils.converData(item.getMoney(),3));
         helper.setText(R.id.tv_time, item.getCreatedTime());
         helper.setText(R.id.tv_desc, item.getDisplayTypeName());
         helper.setText(R.id.tv_dep, item.getDeptName());

app/src/main/java/com/wd/workoffice/ui/adapter/WorkInStockDetailAdapter.java

@@ -38,7 +38,7 @@ public class WorkInStockDetailAdapter extends BaseQuickAdapter<WarehoustBean.Rec
         }
 
         helper.setText(R.id.tv_client, item.getCustomerName());
-        helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(), "1") ? "已启动" : "未启动");
+        helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(), "1") ? "已启用" : "未启用");
         helper.setText(R.id.tv_time, item.getCreatedTime());
     }
 }

app/src/main/java/com/wd/workoffice/ui/adapter/WorkLogisticDetailAdapter.java

@@ -7,6 +7,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.bean.LogisticBean;
 import com.wd.workoffice.bean.LogisticDetailBean;
 import com.wd.workoffice.bean.workEnum.OrderType;
+import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.List;
@@ -27,8 +28,8 @@ public class WorkLogisticDetailAdapter extends BaseQuickAdapter<LogisticDetailBe
         helper.setText(R.id.tv_company, item.getLaunchDeptName());
         helper.setText(R.id.tv_client, item.getCustomerName());
         helper.setText(R.id.tv_name, "快递单号："+item.getTrackingNumber());
-        helper.setText(R.id.tv_weight, String.valueOf(item.getWeight()));
-        helper.setText(R.id.tv_tax, String.valueOf(item.getFareMoney()));
+        helper.setText(R.id.tv_weight, MathUtils.converData(item.getWeight(),3));
+        helper.setText(R.id.tv_tax, MathUtils.converData(item.getFareMoney(),3));
         helper.setText(R.id.tv_person, item.getCreatedUser());
     }
 }

app/src/main/java/com/wd/workoffice/ui/adapter/WorkWarehouseAdapter.java

@@ -35,7 +35,7 @@ public class WorkWarehouseAdapter extends BaseQuickAdapter<WarehoustBean.Records
         }
 
         helper.setText(R.id.tv_client, item.getCustomerName());
-        helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(), "1") ? "已启动" : "未启动");
+        helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(), "1") ? "已启用" : "未启用");
         helper.setText(R.id.tv_time, item.getCreatedTime());
     }
 }

app/src/main/java/com/wd/workoffice/util/ddmfilter/ProFilterData.java

@@ -145,6 +145,7 @@ public class ProFilterData {
                 }
                 JSONObject all = new JSONObject();
                 all.put("name", "全部流程");
+                all.put("subKey", "");
                 processDataList.add(all);
                 processDataList.addAll(JSON.parseArray(data.getData().toString(), JSONObject.class));
                 for (JSONObject process : processDataList) {

app/src/main/res/layout/activity_warehouse_order_search.xml

@@ -29,7 +29,7 @@
                 android:layout_width="100mm"
                 android:layout_height="wrap_content"
                 android:drawableRight="@mipmap/arrow_down"
-                android:gravity="center_vertical"
+                android:gravity="center"
                 android:textSize="13sp"
                 android:text="全部类型"
                 android:textColor="@color/flexible_text_gray" />

app/src/main/res/layout/item_warehoust_order.xml

@@ -33,22 +33,20 @@
             android:textColor="@color/flexible_text_gray"
             android:textSize="12sp" />
 
+
         <TextView
-            android:id="@+id/tv_img_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="10mm"
+            android:text="图号:"
             android:textColor="@color/flexible_text_gray"
             android:textSize="12sp" />
-
         <TextView
-
+            android:id="@+id/tv_img_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10mm"
-            android:text="图号:"
             android:textColor="@color/flexible_text_gray"
             android:textSize="12sp" />
-
         <TextView
             android:id="@+id/tv_price"
             android:layout_width="match_parent"