fix: 多个国际进出港页面必填项与筛选逻辑调整
- 进港舱单新增/编辑:品名(中)改为非必填 - 国际出港开始计重:运抵件数/重量改为必填,新增运抵重量超预配3%校验 - 国际出港板箱过磅:架子车号改为非必填 - 国际进港出库列表:新增特码栏、删除提货单号、提取时间改办理时间、查询条件改特码 - 进港/出港仓库列表:清仓结果筛选传参修复并反转值(正常=1/异常=0) - 组装ULD未维护提示文言优化,版本号升至1.8.8 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -368,7 +368,6 @@ class GjjManifestAddViewModel : BaseViewModel() {
|
||||
|| actualNum.value.verifyNullOrEmpty("请输入实到件数")
|
||||
|| actualWeight.value.verifyNullOrEmpty("请输入实到重量")
|
||||
|| billingWeight.value.verifyNullOrEmpty("请输入计费重量")
|
||||
|| goodsNameCn.value.verifyNullOrEmpty("请输入品名(中)")
|
||||
|| goodsNameEn.value.verifyNullOrEmpty("请输入品名(英)")
|
||||
|| waybillType.value.verifyNullOrEmpty("请选择运单类型")
|
||||
|| businessType.value.verifyNullOrEmpty("请选择业务类型")
|
||||
|
||||
@@ -34,7 +34,7 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
|
||||
val paymentDateEnd = MutableLiveData("") // 缴费日期止
|
||||
val agentCode = MutableLiveData("") // 代理人
|
||||
val wbNo = MutableLiveData("") // 运单号
|
||||
val pickUpNo = MutableLiveData("") // 提货单号
|
||||
val spCode = MutableLiveData("") // 特码
|
||||
|
||||
// ========== 下拉列表数据源 ==========
|
||||
val agentList = MutableLiveData(listOf(KeyValue("全部", "")))
|
||||
@@ -90,9 +90,9 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 扫码提货单号
|
||||
* 扫码特码
|
||||
*/
|
||||
fun scanPickUpNo() {
|
||||
fun scanSpCode() {
|
||||
ScanModel.startScan(getTopActivity(), Constant.RequestCode.gnj_chu_ku_list)
|
||||
}
|
||||
|
||||
@@ -144,7 +144,7 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
|
||||
"endDate" to paymentDateEnd.value?.ifEmpty { null },
|
||||
"agentCode" to agentCode.value?.ifEmpty { null },
|
||||
"no" to wbNo.value?.ifEmpty { null },
|
||||
"pkId" to pickUpNo.value?.ifEmpty { null }
|
||||
"spCode" to spCode.value?.ifEmpty { null }
|
||||
)
|
||||
|
||||
val listParams = (filterParams + mapOf(
|
||||
@@ -182,7 +182,7 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
|
||||
refresh()
|
||||
}
|
||||
Constant.RequestCode.gnj_chu_ku_list -> {
|
||||
pickUpNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
|
||||
spCode.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
|
||||
refresh()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,8 +57,8 @@ class IntImpStorageUseViewModel : BasePageViewModel() {
|
||||
init {
|
||||
clearResultList.value = listOf(
|
||||
KeyValue("全部", ""),
|
||||
KeyValue("正常", "0"),
|
||||
KeyValue("异常", "1")
|
||||
KeyValue("正常", "1"),
|
||||
KeyValue("异常", "0")
|
||||
)
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user