eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: eric:116675c9db4153543d8829070f22a2d0f5cc1787
Branches Tags
eric:main
...
compare: eric:85ea4649ef083bc9e49ea3a0ecac5dc1894cb1e0
Branches Tags
eric:main

2 Commits
116675c9db ... 85ea4649ef

Author SHA1 Message Date
YANG JIANKUAN
85ea4649ef Merge branch 'main' of ssh://git.njcqit.com:2222/eric/aerologic-app 2026-01-04 10:19:34 +08:00
YANG JIANKUAN
f4606b7ba5 feat: fix 2026-01-04 10:19:19 +08:00
4 changed files with 8 additions and 7 deletions
Expand all files Collapse all files

2
module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt
View File

@@ -41,7 +41,7 @@ import me.jessyan.autosize.internal.CustomAdapt
* ========== 开发调试开关 ========== * ========== 开发调试开关 ==========
* TODO: 正式发布前务必设置为 false * TODO: 正式发布前务必设置为 false
*/ */
private const val DEV_AUTO_LOGIN = true // 自动登录开关 private const val DEV_AUTO_LOGIN = false // 自动登录开关
@Route(path = ARouterConstants.ACTIVITY_URL_LOGIN) @Route(path = ARouterConstants.ACTIVITY_URL_LOGIN)
class LoginActivity : BaseActivity(), class LoginActivity : BaseActivity(),

2
module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt
View File

@@ -12,5 +12,5 @@ class UldInfoBean {
var totalPieces: String = "" // 总件数 var totalPieces: String = "" // 总件数
var totalWeight: String = "" // 总重量 var totalWeight: String = "" // 总重量
var status: String = "" // 状态(旧字段，保留兼容) var status: String = "" // 状态(旧字段，保留兼容)
var useId: Long = 0 // ULD使用ID（来自getUld接口） var useId: Long? = null // ULD使用ID（来自getUld接口）
} }

2
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
View File

@@ -445,7 +445,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
else -> "" else -> ""
}, },
"loadArea" to loadArea, "loadArea" to loadArea,
"useId" to uldInfo.value?.useId // 添加useId（来自getUld接口） "useId" to if (uldInfo.value?.useId == 0L) null else uldInfo.value?.useId // 添加useId（来自getUld接口）
) )
// 4. 构建wbInfo（运单信息） // 4. 构建wbInfo（运单信息）

9
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt
View File

@@ -30,12 +30,13 @@ class IntExpAssembleViewModel : BasePageViewModel() {
val flightDate = MutableLiveData("") // 航班日期 val flightDate = MutableLiveData("") // 航班日期
val flightNo = MutableLiveData("") // 航班号 val flightNo = MutableLiveData("") // 航班号
val uldNo = MutableLiveData("") // ULD编号 val uldNo = MutableLiveData("") // ULD编号
val reweighStatus = MutableLiveData("全部") // 复磅状态
val reweighStatus = MutableLiveData("") // 复磅状态
val reweighStatusList = MutableLiveData( // 复磅状态选项 val reweighStatusList = MutableLiveData( // 复磅状态选项
listOf( listOf(
KeyValue("全部", "全部"), KeyValue("全部", ""),
KeyValue("未复磅", "未复磅"), KeyValue("未复磅", "0"),
KeyValue("已复磅", "已复磅") KeyValue("已复磅", "1")
) )
) )
val assembler = MutableLiveData("") // 组装人 val assembler = MutableLiveData("") // 组装人