自采入库、新增物品、上传图片、全部收货接口调试,其它逻辑优化
This commit is contained in:
@@ -27,7 +27,7 @@ data class GoodsAddParam(
|
||||
/**
|
||||
* 存储方式
|
||||
*/
|
||||
var storageType: Int? = null,
|
||||
var storageType: String? = null,
|
||||
|
||||
/**
|
||||
* 净材率
|
||||
@@ -37,18 +37,18 @@ data class GoodsAddParam(
|
||||
/**
|
||||
* 库存单位id
|
||||
*/
|
||||
var unitId: Int? = null,
|
||||
var unitId: String? = null,
|
||||
|
||||
/**
|
||||
* 采购单位
|
||||
*/
|
||||
var purchaseUnit: Int = 0,
|
||||
var purchaseUnit: String? = null,
|
||||
|
||||
/**
|
||||
* 单位转换值
|
||||
*/
|
||||
var purchaseValue: Float = 0F,
|
||||
var purchaseValueStr: String = "",
|
||||
//var purchaseValueStr: String = "",
|
||||
|
||||
/**
|
||||
* 采购单价
|
||||
@@ -119,7 +119,7 @@ data class GoodsAddParam(
|
||||
|
||||
val purchaseUnitStr: String
|
||||
get() {
|
||||
if (purchaseUnit == 0) {
|
||||
if (purchaseUnit == null) {
|
||||
return ""
|
||||
}
|
||||
return GlobalData.unitTypeList.find { it.id == purchaseUnit.toString() }?.value ?: ""
|
||||
@@ -131,16 +131,16 @@ data class GoodsAddParam(
|
||||
if (goodType.isNullOrBlank() || goodType == "0") {
|
||||
return "请选择物品类型"
|
||||
}
|
||||
if (storageType == null || storageType == 0) {
|
||||
if (storageType.isNullOrBlank()) {
|
||||
return "请选择存储方式"
|
||||
}
|
||||
if (netRate == null || netRate == 0f) {
|
||||
return "请录入净材率"
|
||||
}
|
||||
if (unitId == null || unitId == 0) {
|
||||
if (unitId.isNullOrBlank()) {
|
||||
return "请选择库存单位"
|
||||
}
|
||||
if (purchaseUnit == null || purchaseUnit == 0) {
|
||||
if (purchaseUnit.isNullOrBlank()) {
|
||||
return "请选择采购单位"
|
||||
}
|
||||
if (purchaseValue == null || purchaseValue == 0f) {
|
||||
|
||||
@@ -15,7 +15,7 @@ data class ApiResponse<T>(
|
||||
val msg: String? = "",
|
||||
val data: T? = null
|
||||
) {
|
||||
fun isSuccess(): Boolean = code == "00000"
|
||||
fun isSuccess(): Boolean = ("00000" == code)
|
||||
|
||||
val result: T?
|
||||
get() = data
|
||||
|
||||
Reference in New Issue
Block a user