From 54a73f9a953e3955b40fcf316e4de7bdd22eac9a Mon Sep 17 00:00:00 2001 From: hwf453 Date: Tue, 5 Sep 2023 17:33:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=9B=98=E7=82=B9=E6=9F=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rehome/zhdcoa/Contans.java | 6 + .../zhdcoa/adapter/RealTimeKcpdAdapter.java | 144 ++++++++++ .../zhdcoa/bean/OneLevelShelvesBean.java | 2 +- .../rehome/zhdcoa/bean/RealTimeKcpdInfo.java | 171 ++++++++++++ .../zhdcoa/bean/SaveRealTimeKcpdInfo.java | 64 +++++ .../zhdcoa/bean/TwoLevelShelvesBean.java | 43 +++ .../zhdcoa/ui/activity/HjpdActivity.java | 250 +++++++++++++----- .../zhdcoa/ui/activity/Kcpd2Activity.java | 4 - app/src/main/res/layout/activity_hjpd.xml | 7 +- .../res/layout/adapter_real_time_kcpd.xml | 165 ++++++++++++ 10 files changed, 777 insertions(+), 79 deletions(-) create mode 100644 app/src/main/java/com/rehome/zhdcoa/adapter/RealTimeKcpdAdapter.java create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/RealTimeKcpdInfo.java create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/SaveRealTimeKcpdInfo.java create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/TwoLevelShelvesBean.java create mode 100644 app/src/main/res/layout/adapter_real_time_kcpd.xml diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index 21977fb..9a7deb6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -289,6 +289,10 @@ public class Contans { * 盘点计划上传 */ public static String PDJHSC = "WLJS/KCPD/SetData.aspx"; + /** + * 实时盘点 + */ + public static String REAL_TIME_PD = "WLJS/KCSSPD/GetListData.ashx"; /** * 条码打印 @@ -556,6 +560,8 @@ public class Contans { public static String YDCK_WZ_UPLOAD_VIDEO_URL="WLJS/WLUP/SetFilesNew.aspx"; //扫码获取母货架编号 public static String GET_SPINNER_PARENT_UDBIN_URL="WLJS/KCSSPD/GetUDBIN.ashx"; + //用母货架编号查询获取子货架编号 + public static String GET_SPINNER_SON_UDBIN_URL="WLJS/KCSSPD/GetUDBINNUM.ashx"; } diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/RealTimeKcpdAdapter.java b/app/src/main/java/com/rehome/zhdcoa/adapter/RealTimeKcpdAdapter.java new file mode 100644 index 0000000..65ceead --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/RealTimeKcpdAdapter.java @@ -0,0 +1,144 @@ +package com.rehome.zhdcoa.adapter; + +import android.content.Context; +import android.graphics.Color; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.CheckBox; +import android.widget.TextView; + +import com.rehome.zhdcoa.R; +import com.rehome.zhdcoa.bean.RealTimeKcpdInfo; +import com.rehome.zhdcoa.entity.KcpdInfo; +import com.zhy.autolayout.utils.AutoUtils; + +import java.util.List; + +public class RealTimeKcpdAdapter extends BaseAdapter implements View.OnClickListener{ + private final List infos; + private final Context context; + private final RealTimeKcpdAdapter.Callback mCallback; + + public interface Callback { + void cbClick(View view); + } + + public RealTimeKcpdAdapter(List infos, Context context, RealTimeKcpdAdapter.Callback mCallback) { + this.infos = infos; + this.context = context; + this.mCallback = mCallback; + } + + @Override + public int getCount() { + return infos.size(); + } + + @Override + public Object getItem(int i) { + return infos.get(i); + } + + @Override + public long getItemId(int i) { + return i; + } + + @Override + public View getView(final int i, View view, ViewGroup viewGroup) { + + final RealTimeKcpdAdapter.ViewHolder holder; + if (view == null) { + holder = new RealTimeKcpdAdapter.ViewHolder(); + view = LayoutInflater.from(context).inflate(R.layout.adapter_real_time_kcpd, viewGroup, false); + holder.tv_ms = view.findViewById(R.id.tv_ms); + holder.tv_sl = view.findViewById(R.id.tv_sl); + holder.tv_wl = view.findViewById(R.id.tv_wl); + holder.tv_hg = view.findViewById(R.id.tv_hg); + holder.cb = view.findViewById(R.id.cb_isprint); + holder.tv_pdsl = view.findViewById(R.id.tv_pdsl); + holder.tv_pdzt = view.findViewById(R.id.tv_pdzt); + holder.tv_hjzy = view.findViewById(R.id.tv_hjzy); + holder.tv_wzbm = view.findViewById(R.id.tv_wzbm); + view.setTag(holder); + AutoUtils.autoSize(view); + } else { + holder = (RealTimeKcpdAdapter.ViewHolder) view.getTag(); + } + + + + holder.tv_ms.setText(infos.get(i).getDESCRIPTION()); + holder.tv_wl.setText(infos.get(i).getBINNUM()); + holder.tv_sl.setText(infos.get(i).getCURBAL() + ""); + holder.tv_hg.setText(infos.get(i).getITEMNUM()); + holder.cb.setChecked(infos.get(i).isFlag()); + holder.tv_pdsl.setText(infos.get(i).getPDSL()); + holder.tv_hjzy.setText(infos.get(i).getSTOCKTYPE()); + holder.tv_wzbm.setText(infos.get(i).getITEMNUM()); + +// if (infos.get(i).getIspd().equals("1")) { +// holder.tv_pdzt.setText("已盘点"); +// int color = context.getResources().getColor(R.color.red); +// holder.tv_pdzt.setTextColor(color); +// holder.tv_ms.setTextColor(color); +// holder.tv_wl.setTextColor(color); +// holder.tv_sl.setTextColor(color); +// holder.tv_hg.setTextColor(color); +// holder.tv_pdsl.setTextColor(color); +// holder.tv_hjzy.setTextColor(color); +// holder.tv_wzbm.setTextColor(color); +// +// if (infos.get(i).getCurbal().equals(infos.get(i).getPdsl())){ +// int color1 = context.getResources().getColor(R.color.red); +// holder.tv_sl.setTextColor(color1); +// holder.tv_pdsl.setTextColor(color1); +// }else { +// int color2 = context.getResources().getColor(R.color.green); +// holder.tv_pdsl.setTextColor(color2); +// holder.tv_wzbm.setTextColor(color2); +// holder.tv_sl.setTextColor(color2); +// holder.tv_pdzt.setTextColor(color2); +// holder.tv_hjzy.setTextColor(color2); +// } +// +// +// +// } else { +// holder.tv_pdzt.setText("未盘点"); +// holder.tv_pdzt.setTextColor(Color.GRAY); +// holder.tv_ms.setTextColor(Color.GRAY); +// holder.tv_wl.setTextColor(Color.GRAY); +// holder.tv_sl.setTextColor(Color.GRAY); +// holder.tv_hg.setTextColor(Color.GRAY); +// holder.tv_pdsl.setTextColor(Color.GRAY); +// holder.tv_hjzy.setTextColor(Color.GRAY); +// holder.tv_wzbm.setTextColor(Color.GRAY); +// } + + holder.cb.setOnClickListener(this); + holder.cb.setTag(i); + + return view; + } + + @Override + public void onClick(View view) { + mCallback.cbClick(view); + } + + + static class ViewHolder { + TextView tv_sl; + TextView tv_ms; + TextView tv_wl; + TextView tv_hg; + CheckBox cb; + TextView tv_pdsl; + TextView tv_pdzt; + TextView tv_hjzy; + TextView tv_wzbm; + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/OneLevelShelvesBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/OneLevelShelvesBean.java index 1438ebc..1801a0d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/OneLevelShelvesBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/OneLevelShelvesBean.java @@ -2,7 +2,7 @@ package com.rehome.zhdcoa.bean; import java.util.List; -public class OneLevelShelvesBean extends DagerEnterApplyBaseBean{ +public class OneLevelShelvesBean extends DagerEnterApplyBaseBean{ private List Datas; public List getDatas() { diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/RealTimeKcpdInfo.java b/app/src/main/java/com/rehome/zhdcoa/bean/RealTimeKcpdInfo.java new file mode 100644 index 0000000..93b5e80 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/RealTimeKcpdInfo.java @@ -0,0 +1,171 @@ +package com.rehome.zhdcoa.bean; + +import java.util.List; + +/** + * 实时盘点查询货贺拿到物资列表 + */ +public class RealTimeKcpdInfo extends DagerEnterApplyBaseBean{ + private List Datas; + + public List getDatas() { + return Datas; + } + + public void setDatas(List datas) { + Datas = datas; + } + public static class RowsBean { + + //序号 + private String SORTSXH; + //物资编码 + private String ITEMNUM; + //货架号 + private String BINNUM; + //批次号 + private String LOTNUM; + //账面数量 + private String CURBAL; + //盘点数量 + private String PDSL; + //盘点状态（0未盘点，1已盘点） + private String ISPD; + //物资描述 + private String DESCRIPTION; + //相关专业 + private String IN6; + //单价 + private String LASTCOST; + //单位 + private String ORDERUNIT; + //货架专业属性 + private String STOCKTYPE; + //总价 + private String ZJ; + //备注 + private String BZ; + + private boolean isFlag; + + public String getSORTSXH() { + return SORTSXH; + } + + public void setSORTSXH(String SORTSXH) { + this.SORTSXH = SORTSXH; + } + + public String getITEMNUM() { + return ITEMNUM; + } + + public void setITEMNUM(String ITEMNUM) { + this.ITEMNUM = ITEMNUM; + } + + public String getBINNUM() { + return BINNUM; + } + + public void setBINNUM(String BINNUM) { + this.BINNUM = BINNUM; + } + + public String getLOTNUM() { + return LOTNUM; + } + + public void setLOTNUM(String LOTNUM) { + this.LOTNUM = LOTNUM; + } + + public String getCURBAL() { + return CURBAL; + } + + public void setCURBAL(String CURBAL) { + this.CURBAL = CURBAL; + } + + public String getPDSL() { + return PDSL; + } + + public void setPDSL(String PDSL) { + this.PDSL = PDSL; + } + + public String getISPD() { + return ISPD; + } + + public void setISPD(String ISPD) { + this.ISPD = ISPD; + } + + public String getDESCRIPTION() { + return DESCRIPTION; + } + + public void setDESCRIPTION(String DESCRIPTION) { + this.DESCRIPTION = DESCRIPTION; + } + + public String getIN6() { + return IN6; + } + + public void setIN6(String IN6) { + this.IN6 = IN6; + } + + public String getLASTCOST() { + return LASTCOST; + } + + public void setLASTCOST(String LASTCOST) { + this.LASTCOST = LASTCOST; + } + + public String getORDERUNIT() { + return ORDERUNIT; + } + + public void setORDERUNIT(String ORDERUNIT) { + this.ORDERUNIT = ORDERUNIT; + } + + public String getSTOCKTYPE() { + return STOCKTYPE; + } + + public void setSTOCKTYPE(String STOCKTYPE) { + this.STOCKTYPE = STOCKTYPE; + } + + public String getZJ() { + return ZJ; + } + + public void setZJ(String ZJ) { + this.ZJ = ZJ; + } + + public String getBZ() { + return BZ; + } + + public void setBZ(String BZ) { + this.BZ = BZ; + } + + public boolean isFlag() { + return isFlag; + } + + public void setFlag(boolean flag) { + isFlag = flag; + } + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/SaveRealTimeKcpdInfo.java b/app/src/main/java/com/rehome/zhdcoa/bean/SaveRealTimeKcpdInfo.java new file mode 100644 index 0000000..c29029e --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/SaveRealTimeKcpdInfo.java @@ -0,0 +1,64 @@ +package com.rehome.zhdcoa.bean; + +public class SaveRealTimeKcpdInfo { + //物资编码 + private String ITEMNUM; + //货架号 + private String BINNUM; + //批次号 + private String LOTNUM; + //盘点数量 + private String PDSL; + //备注 + private String BZ; + //盘点人工号（当前登录人） + private String PDR; + + public String getITEMNUM() { + return ITEMNUM; + } + + public void setITEMNUM(String ITEMNUM) { + this.ITEMNUM = ITEMNUM; + } + + public String getBINNUM() { + return BINNUM; + } + + public void setBINNUM(String BINNUM) { + this.BINNUM = BINNUM; + } + + public String getLOTNUM() { + return LOTNUM; + } + + public void setLOTNUM(String LOTNUM) { + this.LOTNUM = LOTNUM; + } + + public String getPDSL() { + return PDSL; + } + + public void setPDSL(String PDSL) { + this.PDSL = PDSL; + } + + public String getBZ() { + return BZ; + } + + public void setBZ(String BZ) { + this.BZ = BZ; + } + + public String getPDR() { + return PDR; + } + + public void setPDR(String PDR) { + this.PDR = PDR; + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/TwoLevelShelvesBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/TwoLevelShelvesBean.java new file mode 100644 index 0000000..1891621 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/TwoLevelShelvesBean.java @@ -0,0 +1,43 @@ +package com.rehome.zhdcoa.bean; + +import java.util.List; + +/** + * 获取子货架号 + */ +public class TwoLevelShelvesBean extends DagerEnterApplyBaseBean{ + + private List Datas; + + public List getDatas() { + return Datas; + } + + public void setDatas(List datas) { + Datas = datas; + } + + public static class RowsBean { + + //货架号 + private String VALUE; + //货架号 + private String TEXT; + + public String getVALUE() { + return VALUE; + } + + public void setVALUE(String VALUE) { + this.VALUE = VALUE; + } + + public String getTEXT() { + return TEXT; + } + + public void setTEXT(String TEXT) { + this.TEXT = TEXT; + } + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HjpdActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HjpdActivity.java index 631bdfe..9f3f4d4 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HjpdActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HjpdActivity.java @@ -13,6 +13,7 @@ import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.view.View; import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; @@ -24,9 +25,13 @@ import android.widget.TextView; import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.adapter.KcpdAdapter; +import com.rehome.zhdcoa.adapter.RealTimeKcpdAdapter; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity2; import com.rehome.zhdcoa.bean.OneLevelShelvesBean; +import com.rehome.zhdcoa.bean.RealTimeKcpdInfo; +import com.rehome.zhdcoa.bean.SaveRealTimeKcpdInfo; +import com.rehome.zhdcoa.bean.TwoLevelShelvesBean; import com.rehome.zhdcoa.entity.KcpdInfo; import com.rehome.zhdcoa.entity.StatusInfo; import com.rehome.zhdcoa.utils.GsonUtils; @@ -45,7 +50,7 @@ import java.util.List; import com.rehome.zhdcoa.App; -public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { +public class HjpdActivity extends BaseActivity implements RealTimeKcpdAdapter.Callback { EditText et_hgtm; TextView tv_sys; @@ -57,11 +62,16 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { EditText et_sjsl; Button btn_save; Button btn_cancel; + Button btn_itqz; LinearLayout ll; EditText etXmh; TextView tvSyswz; Spinner spBz; + Spinner spinnerSon; + + List spinnerSonList = new ArrayList(); + private void findView() { et_hgtm = findViewById(R.id.et_hgtm); tv_sys = findViewById(R.id.tv_sys); @@ -73,10 +83,12 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { et_sjsl = findViewById(R.id.et_sjsl); btn_save = findViewById(R.id.btn_save); btn_cancel = findViewById(R.id.btn_cancel); + btn_itqz = findViewById(R.id.btn_itqz); ll = findViewById(R.id.ll); etXmh = findViewById(R.id.et_xmh); tvSyswz = findViewById(R.id.tv_syswz); spBz = findViewById(R.id.sp_bz); + spinnerSon = findViewById(R.id.spinnerSon); btn_cancel.setOnClickListener(new View.OnClickListener() { @Override @@ -87,10 +99,12 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { btn_query.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (!TextUtils.isEmpty(UiUtlis.getText(etXmh)) || !TextUtils.isEmpty(UiUtlis.getText(et_hgtm))) { + String spinnerSonSelectItemStr = spinnerSon.getSelectedItem().toString(); + if (!TextUtils.isEmpty(UiUtlis.getText(et_hgtm)) || !TextUtils.isEmpty(spinnerSonSelectItemStr) || !TextUtils.isEmpty(UiUtlis.getText(etXmh))) + { requestData("加载中..."); UiUtlis.hideInput(et_hgtm, context); - } else { + } else{ showToast("请扫码母货架号和填写物资編码"); } } @@ -103,7 +117,7 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { for (int i = 0; i < infos.size(); i++) { if (infos.get(i).isFlag()) { //判断是否已经盘点 - if (infos.get(i).getIspd().equals("1")) { + if (infos.get(i).getISPD().equals("1")) { showPdDialog(false); } else { //如果没有盘点，就盘点 @@ -114,14 +128,20 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { } else { showToast("你还没有输入盘点数量"); } - } else //如果没有选中，点击保存。 - { + } else { + //如果没有选中，点击保存。 +// String spinnerSonSelectItemStr = spinnerSon.getSelectedItem().toString(); +// Request request = NoHttp.createStringRequest(Contans.IP + Contans.REAL_TIME_PD); +// request.add("UDBINNUM", spinnerSonSelectItemStr); +// request.add("ITEMNUM", UiUtlis.getText(etXmh)); +// request.add("BINNUM", UiUtlis.getText(et_hgtm)); + if (!UiUtlis.getText(et_sjsl).isEmpty() && !UiUtlis.getText(et_hgtm).isEmpty() && !UiUtlis.getText(etXmh).isEmpty()) { boolean ispd = false; if (infos.size() != 0) { - for (KcpdInfo.kcpd kcpd : infos) { + for (RealTimeKcpdInfo.RowsBean kcpd : infos) { - if (kcpd.getIspd().equals("1") && kcpd.getBinnum().equals(UiUtlis.getText(et_hgtm))) { + if (kcpd.getISPD().equals("1") && kcpd.getBINNUM().equals(UiUtlis.getText(et_hgtm))) { ispd = true; break; } @@ -175,10 +195,17 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { startActivityForResult(intent1, 2); } }); + btn_itqz.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + etXmh.setText("IT"); + //etXmh.setSelection(2); + } + }); } - private KcpdAdapter adapter; - private List infos; + private RealTimeKcpdAdapter adapter; + private List infos; private View headView; private String pdid; @@ -227,7 +254,10 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { String resultText = bundle.getString("result"); et_hgtm.setText(resultText); if (!TextUtils.isEmpty(resultText)) { + //1K101 + //1k102 getSpinnerParentData(resultText); + //getSpinnerParentData("1K101"); } } break; @@ -298,10 +328,11 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { } private void requestData(String msg) { - Request request = NoHttp.createStringRequest(Contans.IP + Contans.PDJH); - request.add("pdid", pdid); - request.add("itemnum", UiUtlis.getText(etXmh)); - request.add("binnum", UiUtlis.getText(et_hgtm)); + String spinnerSonSelectItemStr = spinnerSon.getSelectedItem().toString(); + Request request = NoHttp.createStringRequest(Contans.IP + Contans.REAL_TIME_PD); + request.add("UDBINNUM", spinnerSonSelectItemStr); + request.add("ITEMNUM", UiUtlis.getText(etXmh)); + request.add("BINNUM", UiUtlis.getText(et_hgtm)); NohttpUtils.getInstance().add(HjpdActivity.this, 0, request, callback, true, true, msg); } @@ -315,28 +346,29 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { private final HttpListener callback = new HttpListener() { @Override public void onSucceed(int what, Response response) { - + String result = response.get(); + showLog(result); switch (what) { case 0: - KcpdInfo kcpdInfo = GsonUtils.GsonToBean(response.get(), KcpdInfo.class); - if (kcpdInfo != null) { - if (kcpdInfo.getTotal() != 0) { - if (TextUtils.isEmpty(UiUtlis.getText(et_hgtm))) { - playSound(); - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setCancelable(false); - builder.setTitle("提示"); - builder.setMessage("该货柜下无此物资"); - builder.setPositiveButton("返回", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - } - }); - builder.create().show(); - } + RealTimeKcpdInfo realTimeKcpdInfo = GsonUtils.GsonToBean(result, RealTimeKcpdInfo.class); + if (realTimeKcpdInfo != null) { + if (realTimeKcpdInfo.isFlag()) { +// if (TextUtils.isEmpty(UiUtlis.getText(et_hgtm))) { +// playSound(); +// AlertDialog.Builder builder = new AlertDialog.Builder(context); +// builder.setCancelable(false); +// builder.setTitle("提示"); +// builder.setMessage("该货柜下无此物资"); +// builder.setPositiveButton("返回", new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialog, int which) { +// dialog.dismiss(); +// } +// }); +// builder.create().show(); +// } infos.clear(); - infos.addAll(kcpdInfo.getRows()); + infos.addAll(realTimeKcpdInfo.getDatas()); setListData(); } else { infos.clear(); @@ -389,7 +421,7 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { lv.addHeaderView(headView, null, false); } if (adapter == null) { - adapter = new KcpdAdapter(infos, context, HjpdActivity.this); + adapter = new RealTimeKcpdAdapter(infos, context, this); lv.setAdapter(adapter); lv.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override @@ -419,12 +451,12 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { private void updateView(int index) { selectItem = index; - et_xm.setText(infos.get(index).getItemnum()); - et_ms.setText(infos.get(index).getDescription()); - et_sl.setText(infos.get(index).getCurbal() + ""); - et_sjsl.setText(infos.get(index).getCurbal() + ""); + et_xm.setText(infos.get(index).getITEMNUM()); + et_ms.setText(infos.get(index).getDESCRIPTION()); + et_sl.setText(infos.get(index).getCURBAL() + ""); + et_sjsl.setText(infos.get(index).getCURBAL() + ""); et_sjsl.setEnabled(true); - et_hgtm.setText(infos.get(index).getBinnum()); + et_hgtm.setText(infos.get(index).getBINNUM()); } private void clearView() { @@ -455,36 +487,32 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { private String toJson(String sjpdzt) { String json = ""; - if (selectItem != -1) { - KcpdInfo info = new KcpdInfo(); - List list = new ArrayList<>(); - KcpdInfo.kcpd kcpd = infos.get(selectItem); - kcpd.setPdsl(et_sjsl.getText().toString()); - kcpd.setPdr(App.getInstance().getUserInfo().getManid()); - kcpd.setSjpdzt(sjpdzt); - kcpd.setBz((String) spBz.getSelectedItem()); - kcpd.setUname(App.getInstance().getUserInfo().getManid()); - list.add(kcpd); - info.setRows(list); - info.setTotal(1); - json = GsonUtils.GsonString(info); - } +// if (selectItem != -1) { +// KcpdInfo info = new KcpdInfo(); +// List list = new ArrayList<>(); +// KcpdInfo.kcpd kcpd = infos.get(selectItem); +// kcpd.setPdsl(et_sjsl.getText().toString()); +// kcpd.setPdr(App.getInstance().getUserInfo().getManid()); +// kcpd.setSjpdzt(sjpdzt); +// kcpd.setBz((String) spBz.getSelectedItem()); +// kcpd.setUname(App.getInstance().getUserInfo().getManid()); +// list.add(kcpd); +// info.setRows(list); +// info.setTotal(1); +// json = GsonUtils.GsonString(info); +// } return json; } - private String addJson(String sjpdzt, KcpdInfo.kcpd kcpd) { + private String addJson(String sjpdzt, RealTimeKcpdInfo.RowsBean kcpd) { String json = ""; - KcpdInfo info = new KcpdInfo(); - List list = new ArrayList<>(); - kcpd.setPdsl(et_sjsl.getText().toString()); - kcpd.setPdr(App.getInstance().getUserInfo().getManid()); - kcpd.setSjpdzt(sjpdzt); - kcpd.setBz((String) spBz.getSelectedItem()); - kcpd.setUname(App.getInstance().getUserInfo().getManid()); - kcpd.setBinnum(UiUtlis.getText(et_hgtm)); - list.add(kcpd); - info.setRows(list); - info.setTotal(1); + SaveRealTimeKcpdInfo info = new SaveRealTimeKcpdInfo(); + info.setPDSL(et_sjsl.getText().toString()); + info.setPDR(App.getInstance().getUserInfo().getManid()); + info.setITEMNUM(kcpd.getITEMNUM()); + info.setBZ((String) spBz.getSelectedItem()); + info.setLOTNUM(kcpd.getLOTNUM()); + info.setBINNUM(kcpd.getBINNUM()); json = GsonUtils.GsonString(info); return json; } @@ -535,19 +563,36 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { //获取子货架 private void getSpinnerSonData(String binnum) { - String url = Contans.IP + Contans.GET_SPINNER_PARENT_UDBIN_URL; + String url = Contans.IP + Contans.GET_SPINNER_SON_UDBIN_URL; Request request = NoHttp.createStringRequest(url, RequestMethod.GET); request.add("BINNUM", binnum); - NohttpUtils.getInstance().add(HjpdActivity.this, 2, request, new HttpListener() { + NohttpUtils.getInstance().add(HjpdActivity.this, 3, request, new HttpListener() { @Override public void onSucceed(int what, Response response) { - if (what == 2) { + if (what == 3) { String result = response.get(); showLog(result); - OneLevelShelvesBean oneLevelShelvesBean = GsonUtils.GsonToBean(result, OneLevelShelvesBean.class); - if (oneLevelShelvesBean != null) { - if (oneLevelShelvesBean.isFlag() && oneLevelShelvesBean.getDatas() != null && oneLevelShelvesBean.getDatas().size() > 0) { - String BINNUM = oneLevelShelvesBean.getDatas().get(0).getBINNUM(); + TwoLevelShelvesBean twoLevelShelvesBean = GsonUtils.GsonToBean(result, TwoLevelShelvesBean.class); + if (twoLevelShelvesBean != null) { + if (twoLevelShelvesBean.isFlag() && twoLevelShelvesBean.getDatas() != null && twoLevelShelvesBean.getDatas().size() > 0) { + spinnerSonList.clear(); + spinnerSonList.addAll(twoLevelShelvesBean.getDatas()); + + // 在我们的这个位置的话创建我们的数组 + String[] arrayModel = new String[spinnerSonList.size()]; + + ArrayList listText = new ArrayList(); + spinnerSonList.forEach(item -> { + listText.add(item.getTEXT()); + }); + listText.toArray(arrayModel); + + // 然后的话创建一个我们的一个数组适配器并且的话这个数组适配器使我们的字符串类型的 + ArrayAdapter adapter = new ArrayAdapter(HjpdActivity.this, android.R.layout.simple_spinner_item, arrayModel); + // 设置我们的数组下拉时的选项的样式 + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + spinnerSon.setAdapter(adapter); + } } } @@ -560,4 +605,63 @@ public class HjpdActivity extends BaseActivity implements KcpdAdapter.Callback { } }, true, true, UiUtlis.getString(context, R.string.loading)); } -} \ No newline at end of file +} + +/** + * 1K101 + * 1K101-013 + * IT63966 + *

+ * 1K101 + * 1K101-043 + * IT63867 + *

+ * 1K102 + * 1K101-013 + * IT62209 + * IT62210 + * IT62211 + * IT60669 + *

+ * 1K103 + * 1K101-034 + * IT16159 + *

+ * 1K101 + * 1K101-043 + * IT63867 + *

+ * 1K102 + * 1K101-013 + * IT62209 + * IT62210 + * IT62211 + * IT60669 + *

+ * 1K103 + * 1K101-034 + * IT16159 + */ + +/** + * 1K101 + * 1K101-043 + * IT63867 + */ + +/** + * 1K102 + * 1K101-013 + * IT62209 + * IT62210 + * IT62211 + * IT60669 + */ + + +/** + * 1K103 + * 1K101-034 + * IT16159 + */ + diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Kcpd2Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Kcpd2Activity.java index e3e7924..3f57c91 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Kcpd2Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Kcpd2Activity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.util.Log; import android.view.View; import android.widget.ListView; - import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.adapter.CommonAdapter; @@ -14,13 +13,11 @@ import com.rehome.zhdcoa.entity.PdjhInfo; import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.NohttpUtils; -import com.rehome.zhdcoa.utils.SPUtils; import com.rehome.zhdcoa.utils.UiUtlis; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.rest.Request; import com.yolanda.nohttp.rest.Response; - import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -37,7 +34,6 @@ public class Kcpd2Activity extends BaseActivity2 { ListView lv_pdjh; private PdjhInfo pdjhInfo; private List list = new ArrayList<>(); - ; private CommonAdapter cAdapter; @Override diff --git a/app/src/main/res/layout/activity_hjpd.xml b/app/src/main/res/layout/activity_hjpd.xml index 1f81f6d..020111d 100644 --- a/app/src/main/res/layout/activity_hjpd.xml +++ b/app/src/main/res/layout/activity_hjpd.xml @@ -33,7 +33,6 @@ @@ -118,6 +117,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> +