1.修改bug

2.//TODO (采购新增，设备采购-维修列表接口,新增维修的部门接口，接单显示规则)，坩埚下单，下单时间选择器当前时间验证，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseInfoActivity.java

@@ -383,10 +383,10 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                 page = 1;
                 if (TextUtils.equals("6", type)) {
                     tradeParam.put("current", 1);
-                    tradeParam.put("searchValue", etKey.getText().toString());
+                    tradeParam.put("name", etKey.getText().toString());
                     batChooseInfoPresenter.getTradingProList(tradeParam);
                 } else {
-                    param.put("name", etKey.getText().toString());
+                    param.put("searchValue", etKey.getText().toString());
                     param.put("current", 1);
                     batChooseInfoPresenter.getPro(param);
                 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleCarActivity.java

@@ -102,6 +102,10 @@ public class StoreSaleCarActivity extends WorkToolBarActivity {
         for (ProductBean.RecordsBean recordsBean : productList) {
             allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", recordsBean.getInternalPrice()+"", 2), 2);
         }
+        if (productList.size()==0){
+            toast("购物车里没有产品哦");
+            return;
+        }
         startActivity(StoreSaleConfirmActivity.class, "pro", JSON.toJSONString(productList),
                 "subProcess", getIntent().getStringExtra("subProcess"),
                 "supplierId",getIntent().getStringExtra("supplierId"),

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleClientActivity.java

@@ -138,7 +138,7 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
                 if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
 
                 }
-                toast("搜索成功");
+//                toast("搜索成功");
             }
         });
     }

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

@@ -219,11 +219,11 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
     private boolean hasPermission() {
         boolean hasPermission = false;
         if (TextUtils.equals(orderType, "供应订单")) {
-            if (!WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_LIST.getPermission())) {
+            if (WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_LIST.getPermission())) {
                 hasPermission = true;
             }
         } else if (TextUtils.equals(orderType, "外采购订单")) {
-            if (!WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_LIST.getPermission())) {
+            if (WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_LIST.getPermission())) {
                 hasPermission = true;
             }
         }

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

@@ -73,7 +73,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="6mm"
-                                android:text="已发起"
+                                android:text="待审核"
                                 android:textColor="#ff798188"
                                 android:textSize="14sp" />
                         </LinearLayout>