1.组装订单重置选项

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderAddActivity.java

@@ -102,13 +102,19 @@ public class ProductOrderAddActivity extends WorkToolBarActivity {
             String clientName = data.getStringExtra("clientName");
             clientId = data.getIntExtra("id", 0);
             tvClient.setText(clientName);
+            fromStockDialog = DialogUtils.listDialog(this);
+            useStockDialog = DialogUtils.listDialog(this);
+            tvUseStock.setText("");
+            tvToStock.setText("");
+            tvFromStock.setText("");
+            chooseFromStock = null;
+            useFromStock = null;
             param.put("customerId", clientId);
             getData();
         }
     }
 
 
-
     @Override
     public void onStart() {
         super.onStart();
@@ -154,13 +160,13 @@ public class ProductOrderAddActivity extends WorkToolBarActivity {
                     toast("请先选择领用仓库");
                     return;
                 }
-                JSONObject base =new JSONObject();
-                base.put("1",tvClient.getText().toString());
-                base.put("2",tvFromStock.getText().toString());
-                base.put("3",tvToStock.getText().toString());
-                base.put("4",tvUseStock.getText().toString());
+                JSONObject base = new JSONObject();
+                base.put("1", tvClient.getText().toString());
+                base.put("2", tvFromStock.getText().toString());
+                base.put("3", tvToStock.getText().toString());
+                base.put("4", tvUseStock.getText().toString());
                 startActivity(ProductOrderProActivity.class,
-                        "base",base.toJSONString(),
+                        "base", base.toJSONString(),
                         "customerId", clientId.toString(),
                         "usedStockId", useFromStock.getId() + "",
                         "targetStockId", chooseFromStock.getId() + "");
@@ -197,8 +203,6 @@ public class ProductOrderAddActivity extends WorkToolBarActivity {
                 List<WarehoustBean.RecordsBean> getList = JSON.parseArray(data.getData().toString(), WarehoustBean.RecordsBean.class);
                 stockList = getList;
                 stockNameList.clear();
-                fromStockDialog = DialogUtils.listDialog(ProductOrderAddActivity.this);
-                useStockDialog = DialogUtils.listDialog(ProductOrderAddActivity.this);
                 for (WarehoustBean.RecordsBean process : stockList) {
                     stockNameList.add(process.getName());
                 }

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

@@ -125,7 +125,7 @@
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="请选择来源仓库"
+                        android:hint="请选择来源仓库"
                         android:textSize="15sp"
                         android:textStyle="bold" />
 
@@ -184,7 +184,7 @@
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="请选择目标客户"
+                        android:hint="请选择目标客户"
                         android:textSize="15sp"
                         android:textStyle="bold" />
 
@@ -242,7 +242,7 @@
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="请选择领用仓库"
+                        android:hint="请选择领用仓库"
                         android:textSize="15sp"
                         android:textStyle="bold" />