1.修改下单问题

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数

app/src/main/AndroidManifest.xml

@@ -1881,7 +1881,22 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
-
+        <activity
+            android:name=".ui.activity.bat.work.WorkDeviceActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="设备"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.work.WorkDeviceListActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="设备列表"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/app/WorkApp.java

@@ -40,7 +40,7 @@ public class WorkApp extends BaseApp {
     public void onCreate() {
         super.onCreate();
         instance = this;
-//        CrashReport.initCrashReport(getApplicationContext(), "8081eafad1", Config.DEBUG);
+        CrashReport.initCrashReport(getApplicationContext(), "8081eafad1", Config.DEBUG);
         Utils.init(this);
         AutoSizeConfig.getInstance().setCustomFragment(true);
         AutoSizeConfig.getInstance().getUnitsManager()

app/src/main/java/com/wd/workoffice/ui/activity/MainActivity.java

@@ -93,15 +93,15 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
                                 setInactiveIconResource(R.mipmap.main_my))
                 .initialise();
         fm = getSupportFragmentManager();
-//        WorkUtils.refreshToken();
+        WorkUtils.refreshToken();
         fragments = getFragments();
         bnbMainBottomBar.setTabSelectedListener(this);
-        mainContent.setOffscreenPageLimit(4);
-        VpMainAdapter vpFgAdapter = new VpMainAdapter(fm, fragments);
-        mainContent.setAdapter(vpFgAdapter);
-        if (TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo()) && UserKeeper.getInstance().getMesLogin()) {
-            bnbMainBottomBar.selectTab(2);
-        }
+//        mainContent.setOffscreenPageLimit(4);
+//        VpMainAdapter vpFgAdapter = new VpMainAdapter(fm, fragments);
+//        mainContent.setAdapter(vpFgAdapter);
+//        if (TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo()) && UserKeeper.getInstance().getMesLogin()) {
+//            bnbMainBottomBar.selectTab(2);
+//        }
     }
 
     @Override

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

@@ -107,6 +107,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
     Map<String, Object> carMap = new HashMap<>();
     private List<TradingBean.RecordsBean> tradingProductList;
     private TradingProductAdapter tradingProductAdapter;
+    private Map<String, Object> tradeParam;
 
     @Override
     protected void initView() {
@@ -145,9 +146,6 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                 tvCommonContent.setHint("请选择入库仓库");
                 break;
             case "6":
-                tradingProductList = new ArrayList<>();
-                tradingProductAdapter = new TradingProductAdapter(R.layout.item_trading_product, tradingProductList);
-                tradingProductAdapter.bindToRecyclerView(rvData);
                 permissionCode = PermissionType.PROCESS_INSIDE.getCode();
                 llClient.setVisibility(View.GONE);
                 llSupplier.setVisibility(View.GONE);
@@ -164,9 +162,11 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
         proAdapter.bindToRecyclerView(rvData);
         proAdapter.setEmptyView(R.layout.view_empty_order, rvData);
         param = WorkUtils.pageKey();
+        tradeParam = WorkUtils.pageKey();
         param.put("current", 1);
         param.put("processType", permissionCode);
-        param.put("outDeptId",getIntent().getStringExtra("deptId"));
+        param.put("outDeptId", getIntent().getStringExtra("deptId"));
+
         stockParam = WorkUtils.simpleParam();
         stockParam.put("deptId", UserKeeper.getInstance().getUserDepId());
         if (TextUtils.equals("3", type)) {
@@ -174,12 +174,15 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
             batChooseInfoPresenter.getStock(stockParam);
         }
         if (TextUtils.equals("5", type)) {
-            param.put("deptId", getIntent().getStringExtra("deptId"));//内部交易
             batChooseInfoPresenter.getPro(param);
             batChooseInfoPresenter.getStock(stockParam);
         }
         if (TextUtils.equals("6", type)) {
-            batChooseInfoPresenter.getTradingProList(param);
+            tradingProductList = new ArrayList<>();
+            tradingProductAdapter = new TradingProductAdapter(R.layout.item_trading_product, tradingProductList);
+            tradingProductAdapter.bindToRecyclerView(rvData);
+            tradeParam.put("deptId", getIntent().getStringExtra("deptId"));//内部交易
+            batChooseInfoPresenter.getTradingProList(tradeParam);
             batChooseInfoPresenter.getStock(stockParam);
         }
     }
@@ -204,6 +207,14 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                 }
             }
         });
+        if (TextUtils.equals(type, "6")) {
+            tradingProductAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+                @Override
+                public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                    batChooseInfoPresenter.getTradingPro(tradingProductList.get(position));
+                }
+            });
+        }
     }
 
     @Override
@@ -223,11 +234,11 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     }
                     startActivity(StoreTradingCarActivity.class,
                             "pro", JSON.toJSONString(carMap),
-                            "supplierId", supplyId==null?"":supplyId.toString(),
-                            "subProcess", chooseProcess==null?"":chooseProcess.getName(),
-                            "subProcessId",  chooseProcess==null?"":chooseProcess.getId() + "",
-                            "inStockId", chooseStock==null?"":chooseStock.getId() + "",
-                            "customerId", clientId==null?"":clientId.toString(),
+                            "supplierId", supplyId == null ? "" : supplyId.toString(),
+                            "subProcess", chooseProcess == null ? "" : chooseProcess.getName(),
+                            "subProcessId", chooseProcess == null ? "" : chooseProcess.getId() + "",
+                            "inStockId", chooseStock == null ? "" : chooseStock.getId() + "",
+                            "customerId", clientId == null ? "" : clientId.toString(),
                             "receiveDeptId", getIntent().getStringExtra("deptId"),
                             "code", permissionCode);
                 } else {
@@ -287,12 +298,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     }
                     startActivity(StoreSaleCarActivity.class,
                             "pro", JSON.toJSONString(carList),
-                            "supplierId", supplyId==null?"":supplyId.toString(),
-                            "subProcess", chooseProcess==null?"":chooseProcess.getName(),
-                            "subProcessId",  chooseProcess==null?"":chooseProcess.getId() + "",
+                            "supplierId", supplyId == null ? "" : supplyId.toString(),
+                            "subProcess", chooseProcess == null ? "" : chooseProcess.getName(),
+                            "subProcessId", chooseProcess == null ? "" : chooseProcess.getId() + "",
 
-                            "inStockId", chooseStock==null?"":chooseStock.getId() + "",
-                            "customerId", clientId==null?"":clientId.toString(),
+                            "inStockId", chooseStock == null ? "" : chooseStock.getId() + "",
+                            "customerId", clientId == null ? "" : clientId.toString(),
                             "receiveDeptId", getIntent().getStringExtra("deptId"),
                             "code", permissionCode);
                 }
@@ -366,10 +377,17 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                         }
                         break;
                 }
+
+                page = 1;
+                if (TextUtils.equals("6", type)) {
+                    tradeParam.put("current", 1);
+                    tradeParam.put("searchValue", etKey.getText().toString());
+                    batChooseInfoPresenter.getTradingProList(tradeParam);
+                } else {
                     param.put("name", etKey.getText().toString());
                     param.put("current", 1);
-                page = 1;
                     batChooseInfoPresenter.getPro(param);
+                }
                 break;
             case R.id.ll_common:
                 switch (type) {
@@ -424,9 +442,9 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     String clientName = data.getStringExtra("clientName");
                     clientId = data.getIntExtra("id", 0);
                     tvClient.setText(clientName);
-                    param.put("transitPartId", clientId);
                     switch (type) {
                         case "1":
+                            param.put("transitPartId", clientId);
                             batChooseInfoPresenter.getProcess(permissionCode, clientId);
                             break;
                         case "2":
@@ -449,6 +467,24 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     String clientName = data.getStringExtra("clientName");
                     supplyId = data.getIntExtra("id", 0);
                     tvSupplier.setText(clientName);
+                    switch (type) {
+                        case "1":
+                            break;
+                        case "2":
+                            param.put("transitPartId", supplyId);
+                            batChooseInfoPresenter.getPro(param);
+                            break;
+                        case "3":
+                            param.put("transitPartId", supplyId);
+                            batChooseInfoPresenter.getPro(param);
+                            break;
+                        case "4":
+                            break;
+                        case "5":
+                            break;
+                        case "6":
+                            break;
+                    }
                 }
                 break;
         }

app/src/main/java/com/wd/workoffice/ui/fg/MesFragment.java

@@ -48,7 +48,7 @@ public class MesFragment extends WorkBaseFg {
 //            , "工单管理"};
     String[] dataName = new String[]{"订单追踪", "质量报表", "质量分析", "质量绩效",
             "质量追溯", "检维修记录", "设备监控"
-            , "工单管理"};
+            , "市场服务"};
 
 
     @Override