|
@@ -53,6 +53,10 @@ import com.core.widget.view.model.SelectAimModel;
|
|
|
import com.core.widget.view.selectcalendar.SelectCalendarActivity;
|
|
import com.core.widget.view.selectcalendar.SelectCalendarActivity;
|
|
|
import com.core.widget.view.selectcalendar.bean.Data;
|
|
import com.core.widget.view.selectcalendar.bean.Data;
|
|
|
import com.lidroid.xutils.ViewUtils;
|
|
import com.lidroid.xutils.ViewUtils;
|
|
|
|
|
+import com.me.network.app.base.HttpCallback;
|
|
|
|
|
+import com.me.network.app.base.HttpParams;
|
|
|
|
|
+import com.me.network.app.http.HttpRequest;
|
|
|
|
|
+import com.me.network.app.http.Method;
|
|
|
import com.modular.apputils.activity.SelectNetAcitivty;
|
|
import com.modular.apputils.activity.SelectNetAcitivty;
|
|
|
import com.modular.apputils.model.BillGroupModel;
|
|
import com.modular.apputils.model.BillGroupModel;
|
|
|
import com.modular.apputils.utils.PopupWindowHelper;
|
|
import com.modular.apputils.utils.PopupWindowHelper;
|
|
@@ -128,6 +132,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
|
|
|
|
|
private int va_id;//订单ID
|
|
private int va_id;//订单ID
|
|
|
private int formid;//主表ID
|
|
private int formid;//主表ID
|
|
|
|
|
+ private String ve_code;//不合格项目单,特殊处理,特殊取值
|
|
|
private final Comparator<Object> mComparator = new Comparator<Object>() {
|
|
private final Comparator<Object> mComparator = new Comparator<Object>() {
|
|
|
@Override
|
|
@Override
|
|
|
public int compare(Object t0, Object t1) {
|
|
public int compare(Object t0, Object t1) {
|
|
@@ -197,11 +202,16 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
data.setName(items.getString("fd_caption"));
|
|
data.setName(items.getString("fd_caption"));
|
|
|
data.setReadonly(items.getString("fd_readonly"));
|
|
data.setReadonly(items.getString("fd_readonly"));
|
|
|
data.setAllowblank(items.getString("fd_allowblank"));
|
|
data.setAllowblank(items.getString("fd_allowblank"));
|
|
|
- data.setField(items.getString("fd_field"));
|
|
|
|
|
|
|
+ String fd_field = items.getString("fd_field");
|
|
|
|
|
+ String fd_value = items.getString("fd_value");
|
|
|
|
|
+ data.setField(fd_field);
|
|
|
|
|
+ if ("ve_code".equals(fd_field)) {
|
|
|
|
|
+ ve_code = fd_value;
|
|
|
|
|
+ }
|
|
|
|
|
+ data.setValue(fd_value);
|
|
|
data.setDetno(items.getIntValue("fd_detno"));
|
|
data.setDetno(items.getIntValue("fd_detno"));
|
|
|
data.setMaxlength(String.valueOf(items.getIntValue("fd_maxlength")));
|
|
data.setMaxlength(String.valueOf(items.getIntValue("fd_maxlength")));
|
|
|
data.setFdid(items.getIntValue("fd_id"));
|
|
data.setFdid(items.getIntValue("fd_id"));
|
|
|
- data.setValue(items.getString("fd_value"));
|
|
|
|
|
|
|
|
|
|
String dg_findfunctionname = items.getString("dg_findfunctionname");
|
|
String dg_findfunctionname = items.getString("dg_findfunctionname");
|
|
|
if (!TextUtils.isEmpty(dg_findfunctionname)) {
|
|
if (!TextUtils.isEmpty(dg_findfunctionname)) {
|
|
@@ -222,13 +232,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
if (!TextUtils.isEmpty(type) && type.equals("D")) {
|
|
if (!TextUtils.isEmpty(type) && type.equals("D")) {
|
|
|
// data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
// data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
}
|
|
}
|
|
|
- if (startDate.equals(items.getString("fd_field"))) {
|
|
|
|
|
|
|
+ if (startDate.equals(fd_field)) {
|
|
|
// if (StringUtil.isEmpty(data.getValue())) {
|
|
// if (StringUtil.isEmpty(data.getValue())) {
|
|
|
// data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
// data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
// }
|
|
// }
|
|
|
startDate_v = data.getValue();
|
|
startDate_v = data.getValue();
|
|
|
}
|
|
}
|
|
|
- if (endDate.equals(items.getString("fd_field"))) {
|
|
|
|
|
|
|
+ if (endDate.equals(fd_field)) {
|
|
|
// if (StringUtil.isEmpty(data.getValue())) {
|
|
// if (StringUtil.isEmpty(data.getValue())) {
|
|
|
// data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
// data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
// }
|
|
// }
|
|
@@ -311,23 +321,27 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
for (int i = 0; i < grids.size(); i++) {
|
|
for (int i = 0; i < grids.size(); i++) {
|
|
|
JSONObject items = grids.getJSONObject(i);
|
|
JSONObject items = grids.getJSONObject(i);
|
|
|
Data data = new Data();
|
|
Data data = new Data();
|
|
|
- if (detailkey_did.equals(items.getString("dg_field"))) {
|
|
|
|
|
|
|
+ String dg_field = items.getString("dg_field");
|
|
|
|
|
+ String dg_value = items.getString("dg_value");
|
|
|
|
|
+ if (detailkey_did.equals(dg_field)) {
|
|
|
//关联id
|
|
//关联id
|
|
|
- if (StringUtil.isEmpty(items.getString("dg_value"))) {
|
|
|
|
|
|
|
+ if (StringUtil.isEmpty(dg_value)) {
|
|
|
key_did = String.valueOf(formid);
|
|
key_did = String.valueOf(formid);
|
|
|
} else {
|
|
} else {
|
|
|
- key_did = items.getString("dg_value");
|
|
|
|
|
|
|
+ key_did = dg_value;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ if ("ve_code".equals(dg_field)) {
|
|
|
|
|
+ ve_code = dg_value;
|
|
|
}
|
|
}
|
|
|
data.setMaxlength(String.valueOf(items.getIntValue("dg_maxlength")));
|
|
data.setMaxlength(String.valueOf(items.getIntValue("dg_maxlength")));
|
|
|
data.setName(items.getString("dg_caption"));
|
|
data.setName(items.getString("dg_caption"));
|
|
|
data.setAllowblank(items.getString("dg_logictype"));
|
|
data.setAllowblank(items.getString("dg_logictype"));
|
|
|
data.setReadonly(items.getString("dg_editable"));
|
|
data.setReadonly(items.getString("dg_editable"));
|
|
|
- data.setField(items.getString("dg_field"));
|
|
|
|
|
|
|
+ data.setField(dg_field);
|
|
|
data.setDetno(items.getIntValue("dg_sequence"));
|
|
data.setDetno(items.getIntValue("dg_sequence"));
|
|
|
data.setFdid(items.getIntValue("gd_id"));
|
|
data.setFdid(items.getIntValue("gd_id"));
|
|
|
- data.setValue(items.getString("dg_value"));
|
|
|
|
|
|
|
+ data.setValue(dg_value);
|
|
|
|
|
|
|
|
String dg_findfunctionname = items.getString("dg_findfunctionname");
|
|
String dg_findfunctionname = items.getString("dg_findfunctionname");
|
|
|
if (!TextUtils.isEmpty(dg_findfunctionname)) {
|
|
if (!TextUtils.isEmpty(dg_findfunctionname)) {
|
|
@@ -344,15 +358,15 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (d_startDate.equals(items.getString("dg_field"))) {
|
|
|
|
|
- if (StringUtil.isEmpty(items.getString("dg_value"))) {
|
|
|
|
|
|
|
+ if (d_startDate.equals(dg_field)) {
|
|
|
|
|
+ if (StringUtil.isEmpty(dg_value)) {
|
|
|
data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
}
|
|
}
|
|
|
d_startDate_v = data.getValue();
|
|
d_startDate_v = data.getValue();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (d_endDate.equals(items.getString("dg_field"))) {
|
|
|
|
|
- if (StringUtil.isEmpty(items.getString("dg_value"))) {
|
|
|
|
|
|
|
+ if (d_endDate.equals(dg_field)) {
|
|
|
|
|
+ if (StringUtil.isEmpty(dg_value)) {
|
|
|
data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
}
|
|
}
|
|
|
d_endDate_v = data.getValue();
|
|
d_endDate_v = data.getValue();
|
|
@@ -383,9 +397,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
//更新的时候一定要加上明细项id
|
|
//更新的时候一定要加上明细项id
|
|
|
- if (detailkey_id.equals(items.getString("dg_field"))) {
|
|
|
|
|
|
|
+ if (detailkey_id.equals(dg_field)) {
|
|
|
//明细id
|
|
//明细id
|
|
|
- key_id = items.getString("dg_value");
|
|
|
|
|
|
|
+ key_id = dg_value;
|
|
|
values.put(items.getInteger("dg_group"), key_id);
|
|
values.put(items.getInteger("dg_group"), key_id);
|
|
|
if (!ListUtils.isEmpty(itemData)) {
|
|
if (!ListUtils.isEmpty(itemData)) {
|
|
|
// itemData.get(itemData.size() - 1).setDetailId(key_id);
|
|
// itemData.get(itemData.size() - 1).setDetailId(key_id);
|
|
@@ -532,13 +546,14 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
if (formid == 0) {
|
|
if (formid == 0) {
|
|
|
if (btn_update != null) btn_update.setVisibility(View.GONE);
|
|
if (btn_update != null) btn_update.setVisibility(View.GONE);
|
|
|
if (click_btn != null) click_btn.setVisibility(View.VISIBLE);
|
|
if (click_btn != null) click_btn.setVisibility(View.VISIBLE);
|
|
|
|
|
+ change_quality_btn.setVisibility(View.GONE);
|
|
|
} else {
|
|
} else {
|
|
|
if (btn_update != null) btn_update.setVisibility(View.VISIBLE);
|
|
if (btn_update != null) btn_update.setVisibility(View.VISIBLE);
|
|
|
if (click_btn != null) click_btn.setVisibility(View.GONE);
|
|
if (click_btn != null) click_btn.setVisibility(View.GONE);
|
|
|
- }
|
|
|
|
|
- //针对高登电器的生产品质异常单的特殊处理,显示转单按钮
|
|
|
|
|
- if ("VerifyApplyDetail!FQC".equals(caller)) {
|
|
|
|
|
- change_quality_btn.setVisibility(View.VISIBLE);
|
|
|
|
|
|
|
+ //针对高登电器的生产品质异常单的特殊处理,显示转单按钮
|
|
|
|
|
+ if ("VerifyApplyDetail!FQC".equals(caller)) {
|
|
|
|
|
+ change_quality_btn.setVisibility(View.VISIBLE);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if (mDatas.size() == 0) {
|
|
if (mDatas.size() == 0) {
|
|
|
click_btn.setVisibility(View.GONE);
|
|
click_btn.setVisibility(View.GONE);
|
|
@@ -919,7 +934,30 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
updata();
|
|
updata();
|
|
|
} else if (v.getId() == R.id.change_quality_btn) {
|
|
} else if (v.getId() == R.id.change_quality_btn) {
|
|
|
// TODO: 2019/7/17 转品质单
|
|
// TODO: 2019/7/17 转品质单
|
|
|
|
|
+ progressDialog.show();
|
|
|
|
|
+ HttpRequest.getInstance().sendRequest(CommonUtil.getAppBaseUrl(ct),
|
|
|
|
|
+ new HttpParams.Builder()
|
|
|
|
|
+ .url("scm/qc/turnQualityYC.action")
|
|
|
|
|
+ .method(Method.GET)
|
|
|
|
|
+ .flag(0)
|
|
|
|
|
+ .addParam("id", formid)
|
|
|
|
|
+ .addParam("code", ve_code)
|
|
|
|
|
+ .addParam("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"))
|
|
|
|
|
+ .addParam("master", CommonUtil.getMaster())
|
|
|
|
|
+ .addHeader("Cookie", CommonUtil.getErpCookie(ct))
|
|
|
|
|
+ .build(), new HttpCallback() {
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public void onSuccess(int flag, Object o) throws Exception {
|
|
|
|
|
+ progressDialog.dismiss();
|
|
|
|
|
+ toast("转单成功");
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public void onFail(int flag, String failStr) throws Exception {
|
|
|
|
|
+ progressDialog.dismiss();
|
|
|
|
|
+ toast(failStr);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|