|
|
@@ -366,7 +366,7 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
@Override
|
|
|
public void onClick(View v) {
|
|
|
at_station.setText("");
|
|
|
- getReapirInfo("");
|
|
|
+ getReapirInfo(at_station.getText().toString().trim(),ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
|
|
|
at_station.requestFocus();
|
|
|
at_station.setFocusableInTouchMode(true);
|
|
|
}
|
|
|
@@ -478,7 +478,7 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
|
|
|
sc_codecolletwo = SharedPreUtil.getString(mActivity, "sc_codecolletwo", null);
|
|
|
at_station.setText(sc_codecolletwo);
|
|
|
- getReapirInfo(sc_codecolletwo);
|
|
|
+ getReapirInfo(sc_codecolletwo,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
|
|
|
// getfuzzySearchSourceData(sc_codecolletwo,"");
|
|
|
listSama = new ArrayList<>();
|
|
|
WindowManager wm = mActivity.getWindowManager();
|
|
|
@@ -509,12 +509,22 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
va_sr_badnameremark = new Column<String>("不良归类", "SR_BADNAMEREMARK");
|
|
|
va_timeColumn = new Column<String>("时间", "SR_INDATE");
|
|
|
}
|
|
|
- public void getReapirInfo(String bgcode){
|
|
|
+ public void getReapirInfo(String bgcode,String ma_code,String li_code){
|
|
|
+ if (ce_work_code.getText().toString().trim().isEmpty()){
|
|
|
+ CommonUtil.toastNoRepeat(mActivity, "请选择工单流水");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ce_wuli.getText().toString().trim().isEmpty()){
|
|
|
+ CommonUtil.toastNoRepeat(mActivity, "请选择线别");
|
|
|
+ return;
|
|
|
+ }
|
|
|
progressDialog.show();
|
|
|
VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
|
|
|
.url(GloableParams.ADDRESS_SPM_GETREAPIRINFO)
|
|
|
.method(Request.Method.GET)
|
|
|
.addParam("bgcode",bgcode)
|
|
|
+ .addParam("ma_code",ma_code)
|
|
|
+ .addParam("li_code",li_code)
|
|
|
.build(), new HttpCallback() {
|
|
|
@Override
|
|
|
public void onSuccess(int flag, Object o) throws Exception {
|
|
|
@@ -522,7 +532,7 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
try {
|
|
|
JSONObject data = FastjsonUtil.getJSONObject(o.toString(), "data");
|
|
|
String badcode = FastjsonUtil.getText(data, "badcode");
|
|
|
- String ngreason = FastjsonUtil.getText(data, "ngreason");
|
|
|
+ String ngreason = FastjsonUtil.getText(data, "ngreason")+"|其他";
|
|
|
mFeededList.clear();
|
|
|
if (!StringUtil.isEmpty(badcode)){
|
|
|
if (badcode.contains("|")){
|
|
|
@@ -907,8 +917,8 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
org.json.JSONObject dataObject = dataArray.optJSONObject(i);
|
|
|
if (dataObject != null) {
|
|
|
String sc_code = JsonUtils.optStringNotNull(dataObject, "SC_CODE");
|
|
|
- at_station.setText(sc_code);
|
|
|
- getReapirInfo(sc_code);
|
|
|
+// at_station.setText(sc_code);
|
|
|
+ getReapirInfo(sc_code,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
|
|
|
at_station.clearFocus();
|
|
|
ce_work_code.clearFocus();
|
|
|
tv_dc_emcode.clearFocus();
|
|
|
@@ -1094,7 +1104,7 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
// stringList.add(finalInput_Aloneda+"\n");
|
|
|
// }
|
|
|
addDataSamart(finalInput_Aloneda,finalInput_AlonedaTwo,ec_passqtytrim, finalInput_classTwo);
|
|
|
-
|
|
|
+ setAdapter(mFeededList);
|
|
|
for (int i=0;i<stringList.size();i++){
|
|
|
String s = stringList.get(i);
|
|
|
number+=s;
|
|
|
@@ -1197,6 +1207,7 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
ce_work_code.clearFocus();
|
|
|
tv_dc_emcode.requestFocus();
|
|
|
ce_work_code.setFocusable(false);
|
|
|
+ getReapirInfo(at_station.getText().toString().trim(),ma_code,ce_wuli.getText().toString().trim());
|
|
|
closeListPopupWindow();
|
|
|
}
|
|
|
});
|
|
|
@@ -1383,7 +1394,7 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
return;
|
|
|
}
|
|
|
at_station.setText(sc_code);
|
|
|
- getReapirInfo(sc_code);
|
|
|
+ getReapirInfo(sc_code,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
|
|
|
at_station.clearFocus();
|
|
|
ce_work_code.clearFocus();
|
|
|
tv_dc_emcode.clearFocus();
|
|
|
@@ -1468,17 +1479,6 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
|
|
|
|
|
|
|
|
|
- private void handleFeededDatatwo(JSONArray dataArray) {
|
|
|
- StorageRechargeAloneBean bean;
|
|
|
- mFeededListtwo.clear();
|
|
|
- for (Object index : dataArray) {
|
|
|
- JSONObject data = (JSONObject) index;
|
|
|
- bean= new StorageRechargeAloneBean(
|
|
|
- data.getString("alonedata"));
|
|
|
- mFeededListtwo.add(bean);
|
|
|
- }
|
|
|
- setAdaptertwo(mFeededListtwo);
|
|
|
- }
|
|
|
private void setAdaptertwo(ArrayList<StorageRechargeAloneBean> mList) {
|
|
|
LogUtil.i("mList", JSON.toJSONString(mList));
|
|
|
myAdaptertwo = new SelectAdaptertwo(mList);
|
|
|
@@ -1583,6 +1583,7 @@ public class StorageRechargeListFragment extends BaseFragment{
|
|
|
CommonUtil.toastNoRepeat(mActivity,"请选择物理线体");
|
|
|
return;
|
|
|
}
|
|
|
+ getReapirInfo(at_station.getText().toString().trim(),ce_work_code.getText().toString().trim(),li_code);
|
|
|
closeListPopupWindow();
|
|
|
}
|
|
|
});
|
ChengJH