feat: 国际出港运单修改

app/src/main/AndroidManifest.xml

@@ -110,6 +110,12 @@
             android:configChanges="orientation|keyboardHidden"
             android:exported="false"
             android:screenOrientation="userLandscape" />
+        <!-- 国际出港运单修改 -->
+        <activity
+            android:name="com.lukouguoji.gjc.activity.GjcQueryEditActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
         <activity
             android:name="com.lukouguoji.gjc.activity.GjcBoxWeighingActivity"
             android:configChanges="orientation|keyboardHidden"

module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt

@@ -433,6 +433,13 @@ interface Api {
     @POST("IntExpSearch/pageQueryTotal")
     suspend fun getGjcQueryTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
 
+    /**
+     * 国际出港运单修改
+     * 接口路径: /IntExpSearch/update
+     */
+    @POST("IntExpSearch/update")
+    suspend fun updateGjcMaWb(@Body data: RequestBody): BaseResultBean<Any>
+
     /**
      * 国际出港板箱过磅-分页搜索
      * 接口路径: /IntExpWeighting/pageQuery

module_base/src/main/java/com/lukouguoji/module_base/router/ARouterConstants.kt

@@ -129,6 +129,7 @@ object ARouterConstants {
 
     const val ACTIVITY_URL_GJC_QUERY_LIST = "/gjc/GjcQueryListActivity"   //国际出港模块 查询
     const val ACTIVITY_URL_GJC_QUERY_INFO = "/gjc/GjcQueryInfoActivity"   //国际出港模块 详情
+    const val ACTIVITY_URL_GJC_QUERY_EDIT = "/gjc/GjcQueryEditActivity"   //国际出港模块 运单修改
 
     const val ACTIVITY_URL_GJC_YI_KU = "/gjc/GjcYiKuListActivity"   //国际出港 移库
     const val ACTIVITY_URL_GJC_BOX_ASSEMBLE = "/gjc/GjcBoxAssembleListActivity"   //国际出港 板箱组装

module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryActivity.kt

@@ -8,6 +8,9 @@ import com.lukouguoji.gjc.R
 import com.lukouguoji.gjc.databinding.ActivityGjcQueryBinding
 import com.lukouguoji.gjc.viewModel.GjcQueryViewModel
 import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.impl.observe
 import com.lukouguoji.module_base.ktx.getLifecycleOwner
 import com.lukouguoji.module_base.router.ARouterConstants
 
@@ -31,6 +34,11 @@ class GjcQueryActivity :
         viewModel.pageModel
             .bindSmartRefreshLayout(binding.srl, binding.rv, viewModel, getLifecycleOwner())
 
+        // 监听刷新事件
+        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).observe(this) {
+            viewModel.refresh()
+        }
+
         // 初始化代理列表
         viewModel.initAgentList()
 

module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryEditActivity.kt

@@ -0,0 +1,47 @@
+package com.lukouguoji.gjc.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.google.gson.Gson
+import com.lukouguoji.gjc.R
+import com.lukouguoji.gjc.databinding.ActivityGjcQueryEditBinding
+import com.lukouguoji.gjc.viewModel.GjcQueryEditViewModel
+import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.bean.GjcMaWb
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.router.ARouterConstants
+
+/**
+ * 国际出港运单修改页
+ */
+@Route(path = ARouterConstants.ACTIVITY_URL_GJC_QUERY_EDIT)
+class GjcQueryEditActivity :
+    BaseBindingActivity<ActivityGjcQueryEditBinding, GjcQueryEditViewModel>() {
+
+    override fun layoutId() = R.layout.activity_gjc_query_edit
+
+    override fun viewModelClass() = GjcQueryEditViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        binding.viewModel = viewModel
+
+        // 处理返回按钮点击
+        binding.root.findViewById<android.widget.LinearLayout>(R.id.tool_back)?.setOnClickListener {
+            finish()
+        }
+
+        // 初始化数据
+        viewModel.initOnCreated(intent)
+    }
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context, bean: GjcMaWb) {
+            val starter = Intent(context, GjcQueryEditActivity::class.java)
+                .putExtra(Constant.Key.DATA, Gson().toJson(bean))
+            context.startActivity(starter)
+        }
+    }
+}

module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcQueryViewHolder.kt

@@ -1,6 +1,9 @@
 package com.lukouguoji.gjc.holder
 
 import android.view.View
+import android.widget.TextView
+import com.lukouguoji.gjc.R
+import com.lukouguoji.gjc.activity.GjcQueryEditActivity
 import com.lukouguoji.gjc.databinding.ItemGjcQueryBinding
 import com.lukouguoji.module_base.base.BaseViewHolder
 import com.lukouguoji.module_base.bean.GjcMaWb
@@ -23,5 +26,10 @@ class GjcQueryViewHolder(view: View) :
         //     // 后续可添加详情页跳转
         //     // GjcQueryDetailsActivity.start(it.context, bean.maWbId)
         // }
+
+        // 修改按钮点击事件
+        binding.root.findViewById<TextView>(R.id.btnEdit)?.setOnClickListener {
+            GjcQueryEditActivity.start(it.context, bean)
+        }
     }
 }

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryEditViewModel.kt

@@ -0,0 +1,75 @@
+package com.lukouguoji.gjc.viewModel
+
+import android.content.Intent
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.google.gson.Gson
+import com.lukouguoji.module_base.base.BaseViewModel
+import com.lukouguoji.module_base.bean.GjcMaWb
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.http.net.NetApply
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.ktx.launchLoadingCollect
+import com.lukouguoji.module_base.ktx.showToast
+import com.lukouguoji.module_base.ktx.toRequestBody
+import com.lukouguoji.module_base.ktx.verifyNullOrEmpty
+import kotlinx.coroutines.launch
+
+/**
+ * 国际出港运单修改 ViewModel
+ */
+class GjcQueryEditViewModel : BaseViewModel() {
+
+    // 数据Bean
+    val dataBean = MutableLiveData(GjcMaWb())
+
+    /**
+     * 初始化数据
+     */
+    fun initOnCreated(intent: Intent) {
+        val jsonData = intent.getStringExtra(Constant.Key.DATA) ?: ""
+        if (jsonData.isNotEmpty()) {
+            try {
+                dataBean.value = Gson().fromJson(jsonData, GjcMaWb::class.java)
+            } catch (e: Exception) {
+                showToast("数据解析失败")
+                getTopActivity().finish()
+            }
+        } else {
+            showToast("未接收到数据")
+            getTopActivity().finish()
+        }
+    }
+
+    /**
+     * 保存修改
+     */
+    fun submit() {
+        val bean = dataBean.value ?: return
+
+        // 字段校验
+        if (bean.wbNo.verifyNullOrEmpty("运单号不能为空")) return
+
+        // 调用更新接口
+        launchLoadingCollect({
+            NetApply.api.updateGjcMaWb(Gson().toJson(bean).toRequestBody())
+        }) {
+            onSuccess = {
+                showToast("修改成功")
+                // 发送刷新事件
+                viewModelScope.launch {
+                    FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                }
+                getTopActivity().finish()
+            }
+        }
+    }
+
+    /**
+     * 取消按钮
+     */
+    fun cancel() {
+        getTopActivity().finish()
+    }
+}

module_gjc/src/main/res/layout/activity_gjc_query_edit.xml

@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="com.lukouguoji.module_base.ui.weight.data.layout.DataLayoutType" />
+        <variable
+            name="viewModel"
+            type="com.lukouguoji.gjc.viewModel.GjcQueryEditViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_f2"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@color/colorPrimary"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+            <LinearLayout
+                android:id="@+id/tool_back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:src="@mipmap/left_icon"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tool_tv_back"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|left"
+                    android:text="返回"
+                    android:textColor="@color/white"
+                    android:textSize="18sp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/title_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="国际出港运单修改"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="15dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_white_radius_8"
+                    android:orientation="vertical"
+                    android:padding="15dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"运单号"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.wbNo}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"代理人"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.agentName}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入特码"}'
+                            title='@{"特码"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.dataBean.spCode}' />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"运单件数"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.pc)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"运单重量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.weight)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"业务类型"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.businessName}' />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"入库件数"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.arrivePc)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"入库重量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.arriveWeight)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"计费重量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.weight)}' />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"承运人"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.by0}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"航程"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.range}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入包装类型"}'
+                            title='@{"包装类型"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.dataBean.packageType}' />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"品名(中)"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.goodsCn}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"品名(英)"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.goods}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入UN编号"}'
+                            title='@{"UN编号"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.dataBean.unNumber}' />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入运单类型"}'
+                            title='@{"运单类型"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.dataBean.awbType}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入库位"}'
+                            title='@{"库位"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.dataBean.customsLib}' />
+
+                        <Space
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                    </LinearLayout>
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        enable="@{true}"
+                        hint='@{"请输入备注"}'
+                        inputHeight="@{80}"
+                        title='@{"备注"}'
+                        titleLength="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@={viewModel.dataBean.remark}' />
+
+                </LinearLayout>
+
+                <!-- 底部操作按钮 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center"
+                    android:paddingHorizontal="15dp">
+
+                    <!-- 取消按钮 -->
+                    <TextView
+                        style="@style/tv_bottom_btn"
+                        android:layout_width="120dp"
+                        android:layout_marginEnd="20dp"
+                        android:onClick="@{()-> viewModel.cancel()}"
+                        android:text="取消" />
+
+                    <!-- 保存按钮 -->
+                    <TextView
+                        style="@style/tv_bottom_btn"
+                        android:layout_width="120dp"
+                        android:onClick="@{()-> viewModel.submit()}"
+                        android:text="保存" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+</layout>

module_gjc/src/main/res/layout/item_gjc_query.xml

@@ -8,15 +8,24 @@
             type="com.lukouguoji.module_base.bean.GjcMaWb" />
     </data>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/ll"
+    <com.mcxtzhang.swipemenulib.SwipeMenuLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="15dp"
-        android:layout_marginVertical="5dp"
-        android:background="@drawable/bg_item"
-        android:orientation="horizontal"
-        android:padding="10dp">
+        android:layout_height="wrap_content">
+
+        <!-- 主内容区 -->
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginVertical="5dp"
+                android:background="@drawable/bg_item"
+                android:orientation="horizontal"
+                android:padding="10dp">
 
         <!-- 左侧图标 -->
         <ImageView
@@ -269,4 +278,21 @@
             android:layout_marginLeft="10dp" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        <!-- 侧滑菜单区 -->
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/btnEdit"
+                style="@style/tv_item_action"
+                android:background="@color/colorPrimary"
+                android:text="修改" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
 </layout>