diff --git a/app/src/main/java/com/rehome/zhdcoa/Api.java b/app/src/main/java/com/rehome/zhdcoa/Api.java index 7e5aa80..69012b1 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Api.java +++ b/app/src/main/java/com/rehome/zhdcoa/Api.java @@ -768,6 +768,15 @@ public interface Api { @POST("CBS/WHP/Api/GetHWPSQByID.ashx") Call getHWPSQByID(@Query("ID") String ID); + /** + * 获取危化品清单列表数据 + * @param MAINID + * @return + */ + @GET("CBS/WHP/Api/GetHWPSQ_QDList.ashx") + Call getHwpListByID(@Query("MAINID") String MAINID); + + // @GET("PubFile/Data/GetVerificationCode.ashx") // Call getyzm(@Query("userid") String userid, // @Query("telphone") String telphone, diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index 74cfa0b..f19abaf 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -26,11 +26,11 @@ public class Contans { public static String IP_INTRANET = "http://10.19.0.72:8081/"; - public static String BASE_URL_EXTRANET = "http://219.131.195.3:8082/";//app外网服务器，对应内网ip: 172.16.25.75 - public static String IP_EXTRANET = "http://219.131.195.3:8081/"; +// public static String BASE_URL_EXTRANET = "http://219.131.195.3:8082/";//app外网服务器，对应内网ip: 172.16.25.75 +// public static String IP_EXTRANET = "http://219.131.195.3:8081/"; -// public static String BASE_URL_EXTRANET = "http://192.168.2.215:8082/";//app公司内网开发服务器 -// public static String IP_EXTRANET = "http://192.168.2.215:9005/"; + public static String BASE_URL_EXTRANET = "http://192.168.2.215:8082/";//app公司内网开发服务器 + public static String IP_EXTRANET = "http://192.168.2.215:9005/"; diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/WhpListAdapter.kt b/app/src/main/java/com/rehome/zhdcoa/adapter/WhpListAdapter.kt new file mode 100644 index 0000000..d6a8c2f --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/WhpListAdapter.kt @@ -0,0 +1,45 @@ +package com.rehome.zhdcoa.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import com.rehome.zhdcoa.base.BaseViewBindingAdapter +import com.rehome.zhdcoa.bean.WhpListItemBean +import com.rehome.zhdcoa.databinding.AdapterWhpListBinding + +/** + * Create By HuangWenFei + * 创建日期：2023-07-28 16:45 + * 描述： + */ +class WhpListAdapter (var context: Context,var data: MutableList,var mCallBack: CallBack ) : BaseViewBindingAdapter(context) { + + + interface CallBack { + fun deleteClick(position: Int) + } + override fun getCount(): Int { + return data.count() + } + + override fun getItem(position: Int): Any { + return data[position] + } + + override fun getItemId(position: Int): Long { + return position.toLong() + } + + override fun handleData(position: Int, binding: AdapterWhpListBinding) { + val item: WhpListItemBean = data[position] + binding.tvHSPMC.text = item.hspmc + binding.tvWSLB.text = item.wslb + binding.tvSYBM.text = item.sybm + binding.tvDelete.setOnClickListener { + mCallBack.deleteClick(position) + } + } + + override fun getBinding(inflater: LayoutInflater, parent: ViewGroup?) = AdapterWhpListBinding.inflate(inflater, parent, false) + +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemBean.java new file mode 100644 index 0000000..4c80cd5 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemBean.java @@ -0,0 +1,151 @@ +package com.rehome.zhdcoa.bean; + +import android.os.Parcel; +import android.os.Parcelable; + +import androidx.annotation.NonNull; + +/** + * Create By HuangWenFei + * 创建日期：2023-07-28 14:43 + * 描述： 危化品清单 + */ +public class WhpListItemBean implements Parcelable { + private String ID; + private String MAINID; + private String HSPMC; + private String WSLB; + private String SYBM; + private String ZRR; + private String SRCL; + private String CCDD; + private String RT; + private String MSDS; + + public WhpListItemBean(){ + + } + protected WhpListItemBean(Parcel in) { + MAINID = in.readString(); + HSPMC = in.readString(); + WSLB = in.readString(); + SYBM = in.readString(); + ZRR = in.readString(); + SRCL = in.readString(); + CCDD = in.readString(); + RT = in.readString(); + MSDS = in.readString(); + ID = in.readString(); + } + + public static final Creator CREATOR = new Creator() { + @Override + public WhpListItemBean createFromParcel(Parcel in) { + return new WhpListItemBean(in); + } + + @Override + public WhpListItemBean[] newArray(int size) { + return new WhpListItemBean[size]; + } + }; + + public String getID() { + return ID; + } + + public void setID(String ID) { + this.ID = ID; + } + + public String getMAINID() { + return MAINID; + } + + public void setMAINID(String MAINID) { + this.MAINID = MAINID; + } + + public String getHSPMC() { + return HSPMC; + } + + public void setHSPMC(String HSPMC) { + this.HSPMC = HSPMC; + } + + public String getWSLB() { + return WSLB; + } + + public void setWSLB(String WSLB) { + this.WSLB = WSLB; + } + + public String getSYBM() { + return SYBM; + } + + public void setSYBM(String SYBM) { + this.SYBM = SYBM; + } + + public String getZRR() { + return ZRR; + } + + public void setZRR(String ZRR) { + this.ZRR = ZRR; + } + + public String getSRCL() { + return SRCL; + } + + public void setSRCL(String SRCL) { + this.SRCL = SRCL; + } + + public String getCCDD() { + return CCDD; + } + + public void setCCDD(String CCDD) { + this.CCDD = CCDD; + } + + public String getRT() { + return RT; + } + + public void setRT(String RT) { + this.RT = RT; + } + + public String getMSDS() { + return MSDS; + } + + public void setMSDS(String MSDS) { + this.MSDS = MSDS; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeString(this.MAINID); + dest.writeString(this.HSPMC); + dest.writeString(this.WSLB); + dest.writeString(this.SYBM); + dest.writeString(this.ZRR); + dest.writeString(this.SRCL); + dest.writeString(this.CCDD); + dest.writeString(this.RT); + dest.writeString(this.MSDS); + dest.writeString(this.ID); + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemListBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemListBean.java new file mode 100644 index 0000000..660f2c5 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/WhpListItemListBean.java @@ -0,0 +1,20 @@ +package com.rehome.zhdcoa.bean; + +import java.util.List; + +/** + * Create By HuangWenFei + * 创建日期：2023-07-28 15:33 + * 描述：获取危化品清单列表数据 + */ +public class WhpListItemListBean extends DagerEnterApplyBaseBean { + private List Datas; + + public List getDatas() { + return Datas; + } + + public void setDatas(List datas) { + Datas = datas; + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt index 6e90be8..ff50b15 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt @@ -4,15 +4,19 @@ import android.content.Intent import android.text.TextUtils import android.util.Log import android.view.View +import android.widget.AdapterView import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import com.google.gson.Gson import com.rehome.zhdcoa.Contans +import com.rehome.zhdcoa.adapter.WhpListAdapter import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding import com.rehome.zhdcoa.base.BaseCallBack import com.rehome.zhdcoa.bean.DagerEnterApplyBean import com.rehome.zhdcoa.bean.GetAuditBean import com.rehome.zhdcoa.bean.StaffInfoBean +import com.rehome.zhdcoa.bean.WhpListItemBean +import com.rehome.zhdcoa.bean.WhpListItemListBean import com.rehome.zhdcoa.databinding.ActivityAddDagerEnterApplyBinding import com.rehome.zhdcoa.utils.HttpUtils import com.rehome.zhdcoa.weiget.DateTimeMinutePickDialog @@ -29,6 +33,10 @@ class AddDagerEnterApplyActivity : private var departmentName: String? = null private var isEdit = false; private var id: String? = null; + private val whpList: MutableList = mutableListOf() + private val whpDeleteList: MutableList = mutableListOf() + + private lateinit var adapter: WhpListAdapter private val userInfos: ArrayList = ArrayList() override fun getViewBinding() = ActivityAddDagerEnterApplyBinding.inflate(layoutInflater) @@ -80,10 +88,38 @@ class AddDagerEnterApplyActivity : } override fun initData() { + setAdapter() if (isEdit) { getHWPSQByID() } + } + + private fun setAdapter() { + adapter = WhpListAdapter(context, whpList, object : WhpListAdapter.CallBack { + override fun deleteClick(position: Int) { + + } + }) + binding.lv.adapter = adapter + binding.lv.onItemClickListener = AdapterView.OnItemClickListener { parent: AdapterView<*>?, view: View?, position: Int, id: Long -> + val item = whpList[position] +// if( item.istj==0){ +// //已保存，未提交，进入新增/编辑页面 +// //编辑危化品入厂申请 +// val intent = Intent(context, AddDagerEnterApplyActivity::class.java) +// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) +// intent.putExtra("isEdit",true) +// intent.putExtra("id",item.id) +// startActivity(intent) +// }else{ +// //已提交，进入审核页面 +// val intent = Intent(context, DagerEnterApplyDetailActivity::class.java) +// intent.putExtra("id", item.id) +// intent.putExtra("DepartmentNameId", item.dcfzbz) +// startActivity(intent) +// } + } } //创建一个ActivityResultLauncher @@ -118,29 +154,29 @@ class AddDagerEnterApplyActivity : } } - - //http://192.168.2.215:8082/CBS/WHP/Api/GetHWPSQByID.ashx?ID=6966abb3-8150-4170-9e8a-9e81a6dbe07d //获取一条危化品数据 private fun getHWPSQByID() { - HttpUtils.getApi().getHWPSQByID(id!!).enqueue(object : BaseCallBack(context) { + HttpUtils.getApi().getHWPSQByID(id!!) + .enqueue(object : BaseCallBack(context) { override fun onSuccess( call: Call?, response: retrofit2.Response? ) { val bean = response?.body() - if (bean!=null&&bean.isFlag) { - Log.i("app", Gson().toJson(bean)) - if(bean.datas!=null&&bean.datas.size>0){ - val rowsBean:DagerEnterApplyBean.RowsBean = bean.datas[0] - binding.ilDinnerApply.content=rowsBean.name - binding.ilTravelAddress.content=rowsBean.sqgys - binding.ilTravelsRemark.content=rowsBean.xmname - binding.ilStartTime.content=rowsBean.sqsj - binding.ilDinnerUnit.content=rowsBean.dcfzbzname + if (bean != null && bean.isFlag) { + showToast(Gson().toJson(bean)) + if (bean.datas != null && bean.datas.size > 0) { + val rowsBean: DagerEnterApplyBean.RowsBean = bean.datas[0] + binding.ilDinnerApply.content = rowsBean.name + binding.ilTravelAddress.content = rowsBean.sqgys + binding.ilTravelsRemark.content = rowsBean.xmname + binding.ilStartTime.content = rowsBean.sqsj + binding.ilDinnerUnit.content = rowsBean.dcfzbzname departmentId = rowsBean.dcfzbz departmentName = rowsBean.dcfzbzname id = rowsBean.id + getHwpListByID() } } @@ -152,4 +188,28 @@ class AddDagerEnterApplyActivity : }) } + //获取危化品清单数据 + private fun getHwpListByID() { + + HttpUtils.getApi().getHwpListByID(id!!) + .enqueue(object : BaseCallBack(context) { + override fun onSuccess( + call: Call?, + response: retrofit2.Response? + ) { + val bean = response?.body() + if (bean != null && bean.isFlag) { + showToast(Gson().toJson(bean)) + if (bean.datas != null && bean.datas.size > 0) { + whpList.addAll(bean.datas) + adapter.notifyDataSetChanged() + } + } + } + + override fun onError(call: Call?, t: Throwable?) { + + } + }) + } } \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt index af53f6f..0d3ac81 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt @@ -1,17 +1,32 @@ package com.rehome.zhdcoa.ui.activity +import android.text.TextUtils +import android.widget.Toast import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding +import com.rehome.zhdcoa.bean.WhpListItemBean import com.rehome.zhdcoa.databinding.ActivityAddDagerEnterApplyListBinding +import com.rehome.zhdcoa.ui.toastview.toastviewbymyself -class AddDagerEnterApplyListActivity : BaseActivityOaToolbarViewBinding() { +class AddDagerEnterApplyListActivity : + BaseActivityOaToolbarViewBinding() { override fun getViewBinding() = ActivityAddDagerEnterApplyListBinding.inflate(layoutInflater) override fun getToolbar() = binding.toolbarView.toolbar override fun initView() { - initToolbar("危化品入厂申请", "下一步") { - + initToolbar("危化品入厂申请", "保存") { + if (checkForm()) { + val item: WhpListItemBean = WhpListItemBean(); + item.hspmc = binding.ilHSPMC.content + item.wslb = binding.ilWSLB.content + item.sybm = binding.ilSYBM.content + item.zrr = binding.ilZRR.content + item.srcl = binding.ilSRCL.content + item.ccdd = binding.ilCCDD.content + item.rt = binding.ilRT.content + item.msds = binding.ilMSDS.content + } } } @@ -20,4 +35,39 @@ class AddDagerEnterApplyListActivity : BaseActivityOaToolbarViewBinding + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_dager_enter_apply.xml b/app/src/main/res/layout/activity_add_dager_enter_apply.xml index f1f9482..1eb3aee 100644 --- a/app/src/main/res/layout/activity_add_dager_enter_apply.xml +++ b/app/src/main/res/layout/activity_add_dager_enter_apply.xml @@ -68,6 +68,14 @@ app:must="true" app:tv_title="危化品清单" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8752b02..be148a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -48,6 +48,7 @@ 短期生产队伍数量 TODOST 上传时间: + 删除