Merge branch 'main' of ssh://git.njcqit.com:2222/eric/aerologic-app

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

@@ -411,7 +411,7 @@ interface Api {
      * 接口路径: /IntExpCheckInCheck/back
      */
     @POST("IntExpCheckInCheck/back")
-    suspend fun backGjcInspection(@Body data: RequestBody): BaseResultBean<Boolean>
+    suspend fun backGjcInspection(@Query("reason") reason: String, @Body data: RequestBody): BaseResultBean<Boolean>
 
     /**
      * 条件查询-国际出港-收运审核-统计数据(总件数、总重量、运单总数)

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

@@ -3,6 +3,7 @@ package com.lukouguoji.gjc.viewModel
 import android.content.Intent
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.alibaba.android.arouter.utils.TextUtils
 import com.lukouguoji.module_base.base.BaseViewModel
 import com.lukouguoji.module_base.bean.ComAttach
 import com.lukouguoji.module_base.bean.FileBean
@@ -71,6 +72,10 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
      */
     fun auditReject() {
         val bean = dataBean.value ?: return
+        if (TextUtils.isEmpty(bean.remark)) {
+            showToast("请在备注中输入退回原因")
+            return
+        }
         getTopActivity().showConfirmDialog("确定要退回该单证吗？") {
             performAudit(bean, false, "退回")
         }
@@ -100,7 +105,7 @@ class GjcInspectionDetailsViewModel : BaseViewModel() {
             if (isPass) {
                 NetApply.api.passGjcInspection(requestData)
             } else {
-                NetApply.api.backGjcInspection(requestData)
+                NetApply.api.backGjcInspection(bean.remark, requestData)
             }
         }) {
             onSuccess = {

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

@@ -200,7 +200,8 @@ class GjcInspectionViewModel : BasePageViewModel() {
             if (isPass) {
                 NetApply.api.passGjcInspection(requestData)
             } else {
-                NetApply.api.backGjcInspection(requestData)
+                // TODO: impl reason dialog
+                NetApply.api.backGjcInspection("test reason", requestData)
             }
         }) {
             onSuccess = {

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

@@ -301,10 +301,11 @@
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{true}"
                         inputHeight="@{80}"
-                        title='@{"备注"}'
+                        title='@{"原因"}'
                         titleLength="@{5}"
+                        hint=""
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.remark}'
+                        value='@={viewModel.dataBean.remark}'
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp" />

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

@@ -43,7 +43,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.0"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -55,7 +55,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.no}"
+                        android:text="@{bean.wbNo}"
                         android:textColor="@color/colorPrimary"
                         tools:text="78109081212" />
 
@@ -65,7 +65,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.6"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -157,7 +157,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.0"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -178,7 +178,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.6"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -211,7 +211,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.fdate}"
+                        android:text="@{bean.scheduledTackOff}"
                         tools:text="09:12" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
@@ -232,7 +232,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text='@{bean.businessType}'
+                        android:text='@{bean.businessName}'
                         tools:text="普通货物运输" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
@@ -247,7 +247,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
+                        completeSpace="@{5}"
                         android:text="品名(中)：" />
 
                     <TextView