feat(food-prepare): 增加食材信息录入卡及相关接口支持
- 新增手动录入食材信息的UI布局，包含食材名称搜索、主辅材选择及用量输入 - 整合采样模式下的食材搜索弹窗，支持食材模糊查询与净材种类选择 - 新增相关网络接口调用，实现食材搜索、菜品搜索、菜品构成查询及采样历史等功能 - 优化食材列表展示，支持采样历史审核状态和熟重显示，增加颜色区分 - 修改PrepareFoodActivity，采样模式启用手动新增食材功能，包含添加、重置操作 - 调整Adapter和ViewModel，兼容新接口数据模型，支持分页加载和状态回调 - 修正接口路径和网络请求地址，统一使用nutrition/neglect路径前缀 - 删除冗余代码和未使用的旧接口代码，简化搜索逻辑及界面响应机制
This commit is contained in:
mazengfei
Binary file not shown.
Binary file not shown.
@@ -88,6 +88,14 @@ class FoodListAdapter(
|
||||
// 非烹饪中，采样模式
|
||||
tvDishName.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.dish_green))
|
||||
clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
|
||||
// 新采样历史（sample/history）：展示审核状态 + 熟重(g)
|
||||
val auditName = item.auditStatusName
|
||||
if (!auditName.isNullOrBlank()) {
|
||||
tvDishCount.text = "熟重：${formatGram(foodWeight)}"
|
||||
tvShowState.text = auditName
|
||||
tvShowState.setTextColor(auditStatusColor(holder, item.auditStatus))
|
||||
return@run
|
||||
}
|
||||
val realTotalWeight = if (totalWeight > 0.0) totalWeight else foodWeight
|
||||
val showTotalWeight = if (realTotalWeight == 0.0) "-" else df.format(realTotalWeight / 1000.0F)
|
||||
tvDishCount.text = "累计统计：${showTotalWeight}kg(${item.count ?: "-"}次)"
|
||||
@@ -96,5 +104,21 @@ class FoodListAdapter(
|
||||
}
|
||||
}
|
||||
|
||||
/** 熟重(g)格式化，整数不带小数，小数保留 2 位 */
|
||||
private fun formatGram(weight: Double): String {
|
||||
val gramDf = DecimalFormat("0.##")
|
||||
return "${gramDf.format(weight)}g"
|
||||
}
|
||||
|
||||
/** 审核状态着色：1=待审核(灰) / 2=已通过(绿) / 3=已驳回(红) */
|
||||
private fun auditStatusColor(holder: VH, status: Int?): Int {
|
||||
val context = holder.itemView.context
|
||||
return when (status) {
|
||||
2 -> ContextCompat.getColor(context, R.color.dish_green)
|
||||
3 -> ContextCompat.getColor(context, R.color.red_ff4444)
|
||||
else -> ContextCompat.getColor(context, R.color.black999)
|
||||
}
|
||||
}
|
||||
|
||||
private val df = DecimalFormat("0.000")
|
||||
}
|
||||
|
||||
@@ -11,9 +11,6 @@ import android.view.View
|
||||
import android.view.Window
|
||||
import android.widget.FrameLayout
|
||||
import androidx.core.widget.addTextChangedListener
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.lifecycle.repeatOnLifecycle
|
||||
import androidx.recyclerview.widget.GridLayoutManager
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.chad.library.adapter4.util.setOnDebouncedItemClick
|
||||
@@ -24,6 +21,7 @@ import com.shuwei.dish.match.base.BaseActivity
|
||||
import com.shuwei.dish.match.databinding.DialogFoodSearchBinding
|
||||
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
|
||||
import com.shuwei.dish.match.model.GoodsItem
|
||||
import com.shuwei.dish.match.model.MaterSearchItem
|
||||
import com.shuwei.dish.match.net.UiState
|
||||
import com.shuwei.dish.match.utils.KeyboardUtil
|
||||
import com.shuwei.dish.match.utils.showRawMaterialsDialog
|
||||
@@ -54,15 +52,23 @@ class FoodSearchDialog(
|
||||
isStateViewEnable = true
|
||||
setOnDebouncedItemClick { _, _, position ->
|
||||
val item = list.getOrNull(position) ?: return@setOnDebouncedItemClick
|
||||
// 弹出净材种类单选弹窗，确认后再回调并关闭弹窗
|
||||
item.isClicked = true
|
||||
notifyItemChanged(position)
|
||||
// mater-search 不返回净材种类，rawMaterialsTypes 为空时直接选中返回，避免卡在净材弹窗
|
||||
if (item.rawMaterialsTypes.isNullOrBlank()) {
|
||||
binding.root.postDelayed({
|
||||
onItemSelected(item)
|
||||
dismiss()
|
||||
}, 300)
|
||||
return@setOnDebouncedItemClick
|
||||
}
|
||||
// 有净材种类时弹出单选弹窗，确认后再回调并关闭弹窗
|
||||
showRawMaterialsDialog(
|
||||
context = activity,
|
||||
types = item.rawMaterialsTypes,
|
||||
checkedType = item.rawMaterialsType
|
||||
) { selectedType ->
|
||||
item.rawMaterialsType = selectedType
|
||||
item.isClicked = true
|
||||
notifyItemChanged(position)
|
||||
binding.root.postDelayed({
|
||||
onItemSelected(item)
|
||||
dismiss()
|
||||
@@ -121,8 +127,6 @@ class FoodSearchDialog(
|
||||
binding.ivSearch.setOnClickListener { searchGoods(it) }
|
||||
binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
|
||||
|
||||
initObserver()
|
||||
|
||||
// 若有默认食材名称，自动填充并触发搜索
|
||||
//if (!defGoodsName.isNullOrBlank()) {
|
||||
//binding.etSheetInput.setText(defGoodsName)
|
||||
@@ -170,27 +174,6 @@ class FoodSearchDialog(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 收集 foodSearchGoodsListState，统一处理 Loading / Success / Error 状态
|
||||
* 使用独立的 State，避免与 FoodRecognizeActivity 等页面共用 goodsListState 产生干扰
|
||||
*/
|
||||
private fun initObserver() {
|
||||
activity.lifecycleScope.launch {
|
||||
activity.repeatOnLifecycle(Lifecycle.State.STARTED) {
|
||||
activity.netViewModel.foodSearchGoodsListState.collect { state ->
|
||||
when (state) {
|
||||
is UiState.Success -> loadGoodsList(state.data)
|
||||
is UiState.Error -> {
|
||||
activity.toast(state.msg)
|
||||
finishRefresh()
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 触发搜索：校验输入、隐藏键盘、发起请求
|
||||
*/
|
||||
@@ -205,14 +188,24 @@ class FoodSearchDialog(
|
||||
}
|
||||
|
||||
/**
|
||||
* 请求食材列表，使用弹窗专用接口，结果写入 foodSearchGoodsListState
|
||||
* 请求食材列表（采样模式新配比秤接口 mater-search，回调版本）
|
||||
*/
|
||||
private fun getGoodsList() {
|
||||
activity.netViewModel.queryFoodSearchGoodsList(
|
||||
goodsType = "0",
|
||||
activity.netViewModel.materSearch(
|
||||
keyword = goodsName.takeUnless { it.isNullOrBlank() },
|
||||
pageNum = pageNo,
|
||||
pageSize = PAGE_SIZE,
|
||||
goodsName = goodsName.takeUnless { it.isNullOrBlank() }
|
||||
onResult = { state ->
|
||||
when (state) {
|
||||
is UiState.Success -> loadGoodsList(state.data)
|
||||
is UiState.Error -> {
|
||||
activity.toast(state.msg)
|
||||
finishRefresh()
|
||||
if (pageNo == 1) loadEmptyView()
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -220,7 +213,7 @@ class FoodSearchDialog(
|
||||
* 将返回数据填充到列表
|
||||
*/
|
||||
@SuppressLint("NotifyDataSetChanged")
|
||||
private fun loadGoodsList(records: MutableList<GoodsItem>?) {
|
||||
private fun loadGoodsList(records: List<MaterSearchItem>?) {
|
||||
finishRefresh()
|
||||
if (records.isNullOrEmpty()) {
|
||||
if (pageNo == 1) {
|
||||
@@ -235,20 +228,27 @@ class FoodSearchDialog(
|
||||
}
|
||||
}
|
||||
if (pageNo == 1) list.clear()
|
||||
// 将接口返回的 rawMaterialsType（全部种类）移存到 rawMaterialsTypes，供弹窗使用
|
||||
records.forEach {
|
||||
it.rawMaterialsTypes = it.rawMaterialsType
|
||||
it.rawMaterialsType = null
|
||||
it.oldGoodsId = it.goodsId
|
||||
it.goodsId = it.materId ?: ""
|
||||
}
|
||||
list.addAll(records)
|
||||
// mater-search 不返回净材种类，rawMaterialsTypes 保持 null，点击时直接选中返回
|
||||
val goodsItems = records.map { it.toGoodsItem() }
|
||||
list.addAll(goodsItems)
|
||||
adapter.notifyDataSetChanged()
|
||||
val isLoadMoreEnable = records.size >= PAGE_SIZE
|
||||
binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
|
||||
if (isLoadMoreEnable) pageNo++
|
||||
}
|
||||
|
||||
/**
|
||||
* MaterSearchItem → GoodsItem 映射
|
||||
* id 即食材id，同时作为 goodsId 和 materId（提交 sample/save 时使用）
|
||||
*/
|
||||
private fun MaterSearchItem.toGoodsItem() = GoodsItem(
|
||||
goodsId = id,
|
||||
materId = id,
|
||||
goodsName = materName,
|
||||
materCode = materCode,
|
||||
popularName = alias
|
||||
)
|
||||
|
||||
private fun finishRefresh() {
|
||||
if (pageNo == 1) binding.refreshLayout.finishRefresh()
|
||||
else binding.refreshLayout.finishLoadMore()
|
||||
|
||||
@@ -15,5 +15,14 @@ data class FoodRecord(
|
||||
var dinnerType: String = "0",
|
||||
//true-原始数据，false-非原始数据
|
||||
var isOriginalData: Boolean = true,
|
||||
var sort: Int = 0
|
||||
var sort: Int = 0,
|
||||
// ===== 采样历史（sample/history）扩展字段，制作模式不涉及 =====
|
||||
/** 菜品编号 */
|
||||
var foodCode: String? = null,
|
||||
/** 审核状态: 1=待审核 / 2=已通过 / 3=已驳回 */
|
||||
var auditStatus: Int? = null,
|
||||
/** 审核状态中文 */
|
||||
var auditStatusName: String? = null,
|
||||
/** 审核记录id */
|
||||
var auditRecordId: String? = null
|
||||
) : Serializable
|
||||
|
||||
@@ -32,6 +32,8 @@ data class GoodsItem(
|
||||
var isClicked: Boolean = false,
|
||||
// true-原始数据，false-非原始数据（识图新增）
|
||||
var isOriginalData: Boolean = true,
|
||||
// true-用户手动指定了主辅材，updateMaterialTypes 自动分配时跳过
|
||||
var isMaterialTypeManual: Boolean = false,
|
||||
// 识图匹配分数，-1 表示不显示
|
||||
var foodScore: Int = -1,
|
||||
// 净材种类（当前选中值）
|
||||
|
||||
@@ -0,0 +1,271 @@
|
||||
package com.shuwei.dish.match.model
|
||||
|
||||
/**
|
||||
* 采样与制作模式相关模型，对应配比秤接口（Controller: NutRatioScaleController）
|
||||
* 路径前缀: /neglect/ratio-scale
|
||||
* 序列化规则: Long 字段服务端返回字符串；请求体字段按后端约定（id 类字段用 String 与现有代码一致）
|
||||
*/
|
||||
|
||||
/** 提交构成接口 cookMode 取值（与本地 cookMode 0=制作/1=采样 不同，注意映射） */
|
||||
object ConstituteCookMode {
|
||||
/** 制作模式（基于已有菜品，foodId 必填） */
|
||||
const val MAKE = 1
|
||||
/** 采样模式（从零建菜，foodName 必填） */
|
||||
const val SAMPLE = 2
|
||||
}
|
||||
|
||||
/** 采样菜品审核状态 */
|
||||
object SampleAuditStatus {
|
||||
/** 待审核 */
|
||||
const val PENDING = 1
|
||||
/** 已通过 */
|
||||
const val APPROVED = 2
|
||||
/** 已驳回 */
|
||||
const val REJECTED = 3
|
||||
}
|
||||
|
||||
// ==================== 一、食材模糊搜索 ====================
|
||||
|
||||
/**
|
||||
* 食材模糊搜索请求参数
|
||||
* 对应接口: POST /neglect/ratio-scale/mater-search
|
||||
* 数据源: nut_mater_base，限定设备对应食堂
|
||||
*/
|
||||
data class MaterSearchRequest(
|
||||
/** 模糊匹配食材名称和别名，为空时返回全部 */
|
||||
val keyword: String? = null,
|
||||
/** 页码 */
|
||||
val pageNum: Int = 1,
|
||||
/** 每页条数 */
|
||||
val pageSize: Int = 20
|
||||
)
|
||||
|
||||
/**
|
||||
* 食材模糊搜索结果条目
|
||||
* 注意: id / canteenId 为 Long 类型，服务端序列化为 String
|
||||
*/
|
||||
data class MaterSearchItem(
|
||||
/** 食材id（Long → String，提交构成 items.materId 使用） */
|
||||
val id: String = "",
|
||||
/** 食材名称 */
|
||||
val materName: String = "",
|
||||
/** 食材编码（一级+二级+自编码，全局唯一） */
|
||||
val materCode: String = "",
|
||||
/** 别名，可能为 null */
|
||||
val alias: String? = null,
|
||||
/** 食材一级分类 */
|
||||
val materFirstClass: String? = null,
|
||||
/** 食材二级分类 */
|
||||
val materSecondClass: String? = null,
|
||||
/** 食材图片url */
|
||||
val materUrl: String? = null,
|
||||
/** 归属食堂id（Long → String） */
|
||||
val canteenId: String = ""
|
||||
)
|
||||
|
||||
// ==================== 二、搜菜品 ====================
|
||||
|
||||
/**
|
||||
* 搜菜品请求参数（制作模式选已有菜品）
|
||||
* 对应接口: POST /neglect/ratio-scale/food-search
|
||||
* 数据源: nut_food（status=1 上架）
|
||||
*/
|
||||
data class FoodSearchRequest(
|
||||
/** 菜品名称或编号模糊搜索 */
|
||||
val keyword: String? = null,
|
||||
/** 页码 */
|
||||
val pageNum: Int = 1,
|
||||
/** 每页条数 */
|
||||
val pageSize: Int = 20
|
||||
)
|
||||
|
||||
/**
|
||||
* 搜菜品结果条目
|
||||
* 注意: foodId 为 Long 类型，服务端序列化为 String
|
||||
*/
|
||||
data class FoodSearchItem(
|
||||
/** 菜品id（Long → String） */
|
||||
val foodId: String = "",
|
||||
/** 菜品编号 */
|
||||
val foodCode: String = "",
|
||||
/** 菜品名称 */
|
||||
val foodName: String = ""
|
||||
)
|
||||
|
||||
// ==================== 三、查菜品构成 ====================
|
||||
|
||||
/**
|
||||
* 查菜品构成响应 — 单个食材
|
||||
* 对应接口: GET /neglect/ratio-scale/food/{foodId}/composition
|
||||
*/
|
||||
data class FoodCompositionIngredient(
|
||||
/** 食材id（Long → String） */
|
||||
val materId: String = "",
|
||||
/** 食材名称 */
|
||||
val materName: String = "",
|
||||
/** 用量(g) */
|
||||
val useWeight: Double = 0.0,
|
||||
/** 1=主材 / 2=辅材 / 3=调料 */
|
||||
val isMain: Int = 0,
|
||||
/** 分类中文名 */
|
||||
val isMainName: String = ""
|
||||
)
|
||||
|
||||
/**
|
||||
* 查菜品构成响应（主辅料+调料 + 熟重）
|
||||
* 对应接口: GET /neglect/ratio-scale/food/{foodId}/composition
|
||||
*/
|
||||
data class FoodCompositionResponse(
|
||||
/** 菜品id（Long → String） */
|
||||
val foodId: String = "",
|
||||
/** 菜品名称 */
|
||||
val foodName: String = "",
|
||||
/** 熟重(g)，从 nut_food_cook.output_weight 反查 */
|
||||
val foodWeight: Double = 0.0,
|
||||
/** 食材构成列表 */
|
||||
val ingredients: List<FoodCompositionIngredient> = emptyList()
|
||||
)
|
||||
|
||||
// ==================== 四、提交构成 ====================
|
||||
|
||||
/**
|
||||
* 提交构成 — 单个食材构成条目
|
||||
* 对应接口: POST /neglect/ratio-scale/constitute/save
|
||||
*/
|
||||
data class ConstituteSaveItem(
|
||||
/** 食材id（nut_mater_base.id） */
|
||||
val materId: String = "",
|
||||
/** 食材称量用量(g)，必须 > 0 */
|
||||
val useWeight: Double = 0.0,
|
||||
/** 食材分类: 1=主材 / 2=辅材 / 3=调料 */
|
||||
val isMain: Int = 0
|
||||
)
|
||||
|
||||
/**
|
||||
* 提交构成请求，cookMode 区分采样/制作
|
||||
* 对应接口: POST /neglect/ratio-scale/constitute/save
|
||||
*/
|
||||
data class ConstituteSaveRequest(
|
||||
/** 1=制作模式 / 2=采样模式 */
|
||||
val cookMode: Int = ConstituteCookMode.SAMPLE,
|
||||
/** 制作模式必填 — 已有菜品id */
|
||||
val foodId: String? = null,
|
||||
/** 采样模式必填 — 菜品名称 */
|
||||
val foodName: String? = null,
|
||||
/** 熟重(g)，必须 > 0 */
|
||||
val foodWeight: Double = 0.0,
|
||||
/** 餐次: 1=早餐/2=午餐/3=晚餐/4=加餐，选填 */
|
||||
val mealType: Int? = null,
|
||||
/** 食材构成列表，至少 1 条 */
|
||||
val items: List<ConstituteSaveItem> = emptyList()
|
||||
)
|
||||
|
||||
// ==================== 五、采样历史 ====================
|
||||
|
||||
/**
|
||||
* 采样历史查询请求参数
|
||||
* 对应接口: POST /neglect/ratio-scale/sample/history
|
||||
*/
|
||||
data class SampleHistoryRequest(
|
||||
/** 页码 */
|
||||
val pageNum: Int = 1,
|
||||
/** 每页条数 */
|
||||
val pageSize: Int = 10,
|
||||
/** 菜品名称模糊搜索 */
|
||||
val keyword: String? = null,
|
||||
/** 审核状态筛选: 1=待审核 / 2=已通过 / 3=已驳回，不传查全部 */
|
||||
val auditStatus: Int? = null,
|
||||
/** 采样日期 yyyy-MM-dd，不传默认当天 */
|
||||
val sampleDate: String? = null
|
||||
)
|
||||
|
||||
/**
|
||||
* 采样历史结果条目
|
||||
* 注意: foodId / auditRecordId 为 Long 类型，服务端序列化为 String
|
||||
*/
|
||||
data class SampleHistoryItem(
|
||||
/** 菜品id（Long → String） */
|
||||
val foodId: String = "",
|
||||
/** 菜品编号 */
|
||||
val foodCode: String = "",
|
||||
/** 菜品名称 */
|
||||
val foodName: String = "",
|
||||
/** 熟重(g) */
|
||||
val foodWeight: Double = 0.0,
|
||||
/** 审核状态: 1=待审核 / 2=已通过 / 3=已驳回 */
|
||||
val auditStatus: Int = 0,
|
||||
/** 审核状态中文 */
|
||||
val auditStatusName: String = "",
|
||||
/** 审核记录id（Long → String） */
|
||||
val auditRecordId: String = "",
|
||||
/** 提交时间 */
|
||||
val createTime: String = ""
|
||||
)
|
||||
|
||||
// ==================== 六、制作历史 ====================
|
||||
|
||||
/**
|
||||
* 制作历史查询请求参数
|
||||
* 对应接口: POST /neglect/ratio-scale/make/history
|
||||
* 数据源: nut_food_matching_use，按设备过滤
|
||||
*/
|
||||
data class MakeHistoryRequest(
|
||||
/** 页码 */
|
||||
val pageNum: Int = 1,
|
||||
/** 每页条数 */
|
||||
val pageSize: Int = 10,
|
||||
/** 制作日期 yyyy-MM-dd，不传查全部 */
|
||||
val day: String? = null
|
||||
)
|
||||
|
||||
/**
|
||||
* 制作历史结果条目
|
||||
* 注意: id / foodId 为 Long 类型，服务端序列化为 String
|
||||
*/
|
||||
data class MakeHistoryItem(
|
||||
/** 制作记录id（Long → String） */
|
||||
val id: String = "",
|
||||
/** 菜品id（Long → String） */
|
||||
val foodId: String = "",
|
||||
/** 菜品名称 */
|
||||
val foodName: String = "",
|
||||
/** 熟重(g) */
|
||||
val foodWeight: Double = 0.0,
|
||||
/** 餐次: 1=早餐/2=午餐/3=晚餐/4=加餐 */
|
||||
val mealType: Int = 0,
|
||||
/** 餐次中文 */
|
||||
val mealTypeName: String = "",
|
||||
/** 制作日期 */
|
||||
val day: String = "",
|
||||
/** 制作时间 */
|
||||
val createTime: String = ""
|
||||
)
|
||||
|
||||
// ==================== 七、制作历史图表 ====================
|
||||
|
||||
/**
|
||||
* 制作历史图表 — 横轴项
|
||||
* 对应接口: GET /neglect/ratio-scale/make/history/{foodId}
|
||||
*/
|
||||
data class MakeHistoryChartAxis(
|
||||
/** 食材id（时间/熟重项为空字符串） */
|
||||
val goodId: String = "",
|
||||
/** 项名称（时间/熟重/食材名称） */
|
||||
val goodName: String = ""
|
||||
)
|
||||
|
||||
/**
|
||||
* 制作历史图表 — 纵轴值
|
||||
* value 为 String(时间项) 或 Double(数值项)
|
||||
*/
|
||||
data class MakeHistoryChartValue(
|
||||
val value: Any? = null
|
||||
)
|
||||
|
||||
/**
|
||||
* 制作历史图表 — 单条记录（xAxes 与 yAxes 一一对应）
|
||||
*/
|
||||
data class MakeHistoryChartRow(
|
||||
val xAxes: List<MakeHistoryChartAxis> = emptyList(),
|
||||
val yAxes: List<MakeHistoryChartValue> = emptyList()
|
||||
)
|
||||
@@ -7,7 +7,18 @@ import com.shuwei.dish.match.model.CookOrderMealGroup
|
||||
import com.shuwei.dish.match.model.CookOrderPageRequest
|
||||
import com.shuwei.dish.match.model.FoodRecord
|
||||
import com.shuwei.dish.match.model.GoodsItem
|
||||
import com.shuwei.dish.match.model.ConstituteSaveRequest
|
||||
import com.shuwei.dish.match.model.CookCompleteRequest
|
||||
import com.shuwei.dish.match.model.FoodCompositionResponse
|
||||
import com.shuwei.dish.match.model.FoodSearchItem
|
||||
import com.shuwei.dish.match.model.FoodSearchRequest
|
||||
import com.shuwei.dish.match.model.MakeHistoryChartRow
|
||||
import com.shuwei.dish.match.model.MakeHistoryItem
|
||||
import com.shuwei.dish.match.model.MakeHistoryRequest
|
||||
import com.shuwei.dish.match.model.MaterSearchItem
|
||||
import com.shuwei.dish.match.model.MaterSearchRequest
|
||||
import com.shuwei.dish.match.model.SampleHistoryItem
|
||||
import com.shuwei.dish.match.model.SampleHistoryRequest
|
||||
import com.shuwei.dish.match.model.SeasoningSearchItem
|
||||
import com.shuwei.dish.match.model.SeasoningSearchRequest
|
||||
import okhttp3.MultipartBody
|
||||
@@ -29,7 +40,7 @@ interface ApiService {
|
||||
*/
|
||||
@GET
|
||||
suspend fun getFoodDetail(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/getConstituteByFoodId",
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/getConstituteByFoodId",
|
||||
@Query("foodId") foodId: String
|
||||
): ApiResponse<CookFoodDTO?>
|
||||
|
||||
@@ -39,7 +50,7 @@ interface ApiService {
|
||||
*/
|
||||
@POST
|
||||
suspend fun submitCookFood(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/saveConstitute",
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/saveConstitute",
|
||||
@Body param: CookFoodDTO
|
||||
): ApiResponse<Any?>
|
||||
|
||||
@@ -48,7 +59,7 @@ interface ApiService {
|
||||
*/
|
||||
@POST
|
||||
suspend fun searchFoodList(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/queryPageList",
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/queryPageList",
|
||||
@Body param: MutableMap<String, Any>
|
||||
): ApiResponse<MutableList<FoodRecord>?>
|
||||
|
||||
@@ -57,7 +68,7 @@ interface ApiService {
|
||||
*/
|
||||
@POST
|
||||
suspend fun getSamplingList(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/queryHistoryGoodsInfoList",
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/queryHistoryGoodsInfoList",
|
||||
@Body param: MutableMap<String, Any>
|
||||
): ApiResponse<MutableList<FoodRecord>?>
|
||||
|
||||
@@ -66,7 +77,7 @@ interface ApiService {
|
||||
*/
|
||||
@POST
|
||||
suspend fun queryGoodsList(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/queryGoodsInfoList",
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/queryGoodsInfoList",
|
||||
@Body param: MutableMap<String, Any>
|
||||
): ApiResponse<MutableList<GoodsItem>?>
|
||||
|
||||
@@ -76,7 +87,7 @@ interface ApiService {
|
||||
@Multipart
|
||||
@POST
|
||||
suspend fun uploadFoodVectorData(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/addWeighingCollectionData",
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/addWeighingCollectionData",
|
||||
@PartMap params: MutableMap<String, RequestBody>,
|
||||
@Part foodPics: List<MultipartBody.Part>
|
||||
): ApiResponse<List<String>?>
|
||||
@@ -120,4 +131,66 @@ interface ApiService {
|
||||
@Body request: CookCompleteRequest
|
||||
): ApiResponse<Any?>
|
||||
|
||||
/**
|
||||
* 食材模糊搜索（采样/制作通用，称量前检索食材）
|
||||
* 数据源: nut_mater_base，限定设备对应食堂，模糊匹配名称和别名
|
||||
*/
|
||||
@POST
|
||||
suspend fun materSearch(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/mater-search",
|
||||
@Body request: MaterSearchRequest
|
||||
): ApiResponse<MutableList<MaterSearchItem>?>
|
||||
|
||||
/**
|
||||
* 搜菜品（制作模式选已有上架菜品）
|
||||
*/
|
||||
@POST
|
||||
suspend fun foodSearch(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/food-search",
|
||||
@Body request: FoodSearchRequest
|
||||
): ApiResponse<MutableList<FoodSearchItem>?>
|
||||
|
||||
/**
|
||||
* 查菜品构成（制作模式查看已有菜品主辅料+调料 + 熟重）
|
||||
*/
|
||||
@GET("nutrition/neglect/ratio-scale/food/{foodId}/composition")
|
||||
suspend fun getFoodComposition(
|
||||
@Path("foodId") foodId: String
|
||||
): ApiResponse<FoodCompositionResponse?>
|
||||
|
||||
/**
|
||||
* 提交构成（cookMode 区分采样/制作）
|
||||
*/
|
||||
@POST
|
||||
suspend fun constituteSave(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/constitute/save",
|
||||
@Body request: ConstituteSaveRequest
|
||||
): ApiResponse<Any?>
|
||||
|
||||
/**
|
||||
* 采样历史（本食堂，默认当天）
|
||||
*/
|
||||
@POST
|
||||
suspend fun sampleHistory(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/sample/history",
|
||||
@Body request: SampleHistoryRequest
|
||||
): ApiResponse<MutableList<SampleHistoryItem>?>
|
||||
|
||||
/**
|
||||
* 制作历史（本设备，按日期可选过滤）
|
||||
*/
|
||||
@POST
|
||||
suspend fun makeHistory(
|
||||
@Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/make/history",
|
||||
@Body request: MakeHistoryRequest
|
||||
): ApiResponse<MutableList<MakeHistoryItem>?>
|
||||
|
||||
/**
|
||||
* 制作历史图表（按菜品id）
|
||||
*/
|
||||
@GET("nutrition/neglect/ratio-scale/make/history/{foodId}")
|
||||
suspend fun makeHistoryChart(
|
||||
@Path("foodId") foodId: String
|
||||
): ApiResponse<MutableList<MakeHistoryChartRow>?>
|
||||
|
||||
}
|
||||
@@ -10,7 +10,18 @@ import com.shuwei.dish.match.model.CookOrderPageRequest
|
||||
import com.shuwei.dish.match.model.FoodRecord
|
||||
import com.shuwei.dish.match.model.GoodsItem
|
||||
import com.shuwei.dish.match.model.GoodsNameQueryDTO
|
||||
import com.shuwei.dish.match.model.ConstituteSaveRequest
|
||||
import com.shuwei.dish.match.model.CookCompleteRequest
|
||||
import com.shuwei.dish.match.model.FoodCompositionResponse
|
||||
import com.shuwei.dish.match.model.FoodSearchItem
|
||||
import com.shuwei.dish.match.model.FoodSearchRequest
|
||||
import com.shuwei.dish.match.model.MakeHistoryChartRow
|
||||
import com.shuwei.dish.match.model.MakeHistoryItem
|
||||
import com.shuwei.dish.match.model.MakeHistoryRequest
|
||||
import com.shuwei.dish.match.model.MaterSearchItem
|
||||
import com.shuwei.dish.match.model.MaterSearchRequest
|
||||
import com.shuwei.dish.match.model.SampleHistoryItem
|
||||
import com.shuwei.dish.match.model.SampleHistoryRequest
|
||||
import com.shuwei.dish.match.model.SeasoningSearchItem
|
||||
import com.shuwei.dish.match.model.SeasoningSearchRequest
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
@@ -313,6 +324,134 @@ class NetViewModel(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 食材模糊搜索（回调版本）
|
||||
* @param keyword 模糊匹配食材名称和别名，为 null 时不传该字段
|
||||
* @param pageNum 页码，默认第 1 页
|
||||
* @param pageSize 每页条数，默认 20
|
||||
*/
|
||||
fun materSearch(
|
||||
keyword: String? = null,
|
||||
pageNum: Int = 1,
|
||||
pageSize: Int = 20,
|
||||
onLoading: () -> Unit = {},
|
||||
onResult: (UiState<MutableList<MaterSearchItem>?>) -> Unit
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
onLoading()
|
||||
onResult(repository.materSearch(
|
||||
MaterSearchRequest(keyword = keyword, pageNum = pageNum, pageSize = pageSize)
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 搜菜品（回调版本，制作模式选已有上架菜品）
|
||||
*/
|
||||
fun foodSearch(
|
||||
keyword: String? = null,
|
||||
pageNum: Int = 1,
|
||||
pageSize: Int = 20,
|
||||
onLoading: () -> Unit = {},
|
||||
onResult: (UiState<MutableList<FoodSearchItem>?>) -> Unit
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
onLoading()
|
||||
onResult(repository.foodSearch(
|
||||
FoodSearchRequest(keyword = keyword, pageNum = pageNum, pageSize = pageSize)
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查菜品构成（回调版本，制作模式）
|
||||
*/
|
||||
fun getFoodComposition(
|
||||
foodId: String,
|
||||
onLoading: () -> Unit = {},
|
||||
onResult: (UiState<FoodCompositionResponse?>) -> Unit
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
onLoading()
|
||||
onResult(repository.getFoodComposition(foodId))
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交构成（回调版本，cookMode 区分采样/制作）
|
||||
*/
|
||||
fun constituteSave(
|
||||
request: ConstituteSaveRequest,
|
||||
onLoading: () -> Unit = {},
|
||||
onResult: (UiState<Any?>) -> Unit
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
onLoading()
|
||||
onResult(repository.constituteSave(request))
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 采样历史（回调版本）
|
||||
* @param keyword 菜品名称模糊搜索，为 null 时不传该字段
|
||||
* @param auditStatus 审核状态筛选，为 null 时不传该字段
|
||||
* @param sampleDate 采样日期 yyyy-MM-dd，为 null 时不传该字段
|
||||
*/
|
||||
fun sampleHistory(
|
||||
pageNum: Int = 1,
|
||||
pageSize: Int = 10,
|
||||
keyword: String? = null,
|
||||
auditStatus: Int? = null,
|
||||
sampleDate: String? = null,
|
||||
onLoading: () -> Unit = {},
|
||||
onResult: (UiState<MutableList<SampleHistoryItem>?>) -> Unit
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
onLoading()
|
||||
onResult(repository.sampleHistory(
|
||||
SampleHistoryRequest(
|
||||
pageNum = pageNum,
|
||||
pageSize = pageSize,
|
||||
keyword = keyword,
|
||||
auditStatus = auditStatus,
|
||||
sampleDate = sampleDate
|
||||
)
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 制作历史（回调版本，本设备按日期可选过滤）
|
||||
*/
|
||||
fun makeHistory(
|
||||
pageNum: Int = 1,
|
||||
pageSize: Int = 10,
|
||||
day: String? = null,
|
||||
onLoading: () -> Unit = {},
|
||||
onResult: (UiState<MutableList<MakeHistoryItem>?>) -> Unit
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
onLoading()
|
||||
onResult(repository.makeHistory(
|
||||
MakeHistoryRequest(pageNum = pageNum, pageSize = pageSize, day = day)
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 制作历史图表（回调版本，按菜品id）
|
||||
*/
|
||||
fun makeHistoryChart(
|
||||
foodId: String,
|
||||
onLoading: () -> Unit = {},
|
||||
onResult: (UiState<MutableList<MakeHistoryChartRow>?>) -> Unit
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
onLoading()
|
||||
onResult(repository.makeHistoryChart(foodId))
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传采集菜品信息 UI 状态流，UI 层通过 collect 监听
|
||||
*/
|
||||
|
||||
@@ -6,7 +6,18 @@ import com.shuwei.dish.match.model.CookOrderMealGroup
|
||||
import com.shuwei.dish.match.model.CookOrderPageRequest
|
||||
import com.shuwei.dish.match.model.FoodRecord
|
||||
import com.shuwei.dish.match.model.GoodsItem
|
||||
import com.shuwei.dish.match.model.ConstituteSaveRequest
|
||||
import com.shuwei.dish.match.model.CookCompleteRequest
|
||||
import com.shuwei.dish.match.model.FoodCompositionResponse
|
||||
import com.shuwei.dish.match.model.FoodSearchItem
|
||||
import com.shuwei.dish.match.model.FoodSearchRequest
|
||||
import com.shuwei.dish.match.model.MakeHistoryChartRow
|
||||
import com.shuwei.dish.match.model.MakeHistoryItem
|
||||
import com.shuwei.dish.match.model.MakeHistoryRequest
|
||||
import com.shuwei.dish.match.model.MaterSearchItem
|
||||
import com.shuwei.dish.match.model.MaterSearchRequest
|
||||
import com.shuwei.dish.match.model.SampleHistoryItem
|
||||
import com.shuwei.dish.match.model.SampleHistoryRequest
|
||||
import com.shuwei.dish.match.model.SeasoningSearchItem
|
||||
import com.shuwei.dish.match.model.SeasoningSearchRequest
|
||||
import okhttp3.MultipartBody
|
||||
@@ -65,6 +76,34 @@ class RemoteRepository {
|
||||
suspend fun cookOrderComplete(request: CookCompleteRequest): UiState<Any?> =
|
||||
safeApiCall { apiService.cookOrderComplete(request = request) }
|
||||
|
||||
/** 食材模糊搜索 */
|
||||
suspend fun materSearch(request: MaterSearchRequest): UiState<MutableList<MaterSearchItem>?> =
|
||||
safeApiCall { apiService.materSearch(request = request) }
|
||||
|
||||
/** 搜菜品（制作模式选已有上架菜品） */
|
||||
suspend fun foodSearch(request: FoodSearchRequest): UiState<MutableList<FoodSearchItem>?> =
|
||||
safeApiCall { apiService.foodSearch(request = request) }
|
||||
|
||||
/** 查菜品构成（制作模式） */
|
||||
suspend fun getFoodComposition(foodId: String): UiState<FoodCompositionResponse?> =
|
||||
safeApiCall { apiService.getFoodComposition(foodId = foodId) }
|
||||
|
||||
/** 提交构成（cookMode 区分采样/制作） */
|
||||
suspend fun constituteSave(request: ConstituteSaveRequest): UiState<Any?> =
|
||||
safeApiCall { apiService.constituteSave(request = request) }
|
||||
|
||||
/** 采样历史（本食堂，默认当天） */
|
||||
suspend fun sampleHistory(request: SampleHistoryRequest): UiState<MutableList<SampleHistoryItem>?> =
|
||||
safeApiCall { apiService.sampleHistory(request = request) }
|
||||
|
||||
/** 制作历史（本设备，按日期可选过滤） */
|
||||
suspend fun makeHistory(request: MakeHistoryRequest): UiState<MutableList<MakeHistoryItem>?> =
|
||||
safeApiCall { apiService.makeHistory(request = request) }
|
||||
|
||||
/** 制作历史图表（按菜品id） */
|
||||
suspend fun makeHistoryChart(foodId: String): UiState<MutableList<MakeHistoryChartRow>?> =
|
||||
safeApiCall { apiService.makeHistoryChart(foodId = foodId) }
|
||||
|
||||
/** 上传采集数据 */
|
||||
suspend fun uploadFoodVectorData(
|
||||
params: MutableMap<String, RequestBody>,
|
||||
|
||||
@@ -6,7 +6,7 @@ package com.shuwei.dish.match.scale
|
||||
*/
|
||||
object ScaleDeviceConfig {
|
||||
|
||||
const val DEVICE_ID_2 = "8fc2ab34-2137-3112-acca-f884ea8736d4"//测试0bd74d78-c221-3182-b5ee-55d86dd79283 正式8fc2ab34-2137-3112-acca-f884ea8736d4
|
||||
const val DEVICE_ID_2 = "0bd74d78-c221-3182-b5ee-55d86dd79283"//测试0bd74d78-c221-3182-b5ee-55d86dd79283 正式8fc2ab34-2137-3112-acca-f884ea8736d4
|
||||
const val DEVICE_ID_22 = "a46fa55c-113c-3511-bb1f-41e5eff77c4b"
|
||||
const val DEVICE_ID_18 = "1038da9f-c6eb-326e-a1d9-d6d3af978b22"
|
||||
const val DEVICE_ID_1 = "7cc0f6ea-f13d-3013-a867-fc998eb554ac"
|
||||
|
||||
@@ -4,34 +4,26 @@ import android.annotation.SuppressLint
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.lifecycle.repeatOnLifecycle
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.shuwei.dish.match.R
|
||||
import com.shuwei.dish.match.adapter.Food2Adapter
|
||||
import com.shuwei.dish.match.base.BaseActivity
|
||||
import com.shuwei.dish.match.base.BaseApp
|
||||
import com.shuwei.dish.match.databinding.ActivityFoodSearchBinding
|
||||
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
|
||||
import com.shuwei.dish.match.model.CookOrderItem
|
||||
import com.shuwei.dish.match.model.CookOrderMealGroup
|
||||
import com.shuwei.dish.match.model.CookOrderPageRequest
|
||||
import com.shuwei.dish.match.model.FoodRecord
|
||||
import com.shuwei.dish.match.model.FoodSearchItem
|
||||
import com.shuwei.dish.match.net.UiState
|
||||
import com.shuwei.dish.match.utils.KeyboardUtil
|
||||
import com.shuwei.dish.match.utils.SpTool
|
||||
import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
|
||||
import com.shuwei.dish.match.utils.ext.gone
|
||||
import com.shuwei.dish.match.utils.ext.startActivity
|
||||
import com.shuwei.dish.match.utils.ext.toast
|
||||
import com.shuwei.dish.match.utils.ext.visible
|
||||
import java.io.Serializable
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlin.collections.getOrNull
|
||||
|
||||
/**
|
||||
* 菜品搜索页面
|
||||
* 菜品搜索页面（采样模式：搜索已有上架菜品作为称量模板）
|
||||
* 数据源: POST /neglect/ratio-scale/food-search
|
||||
*/
|
||||
class FoodSearchActivity : BaseActivity() {
|
||||
|
||||
@@ -40,25 +32,16 @@ class FoodSearchActivity : BaseActivity() {
|
||||
const val FOOD_ITEM = "foodItem"
|
||||
const val FOOD_ID = "foodId"
|
||||
const val FOOD_NAME = "foodName"
|
||||
const val DINNER_TYPE = "dinnerType"
|
||||
}
|
||||
|
||||
private lateinit var binding: ActivityFoodSearchBinding
|
||||
|
||||
private var list: MutableList<FoodRecord> = mutableListOf()
|
||||
private var dinnerType = "1"
|
||||
private val recordAdapter by lazy {
|
||||
Food2Adapter(list).apply {
|
||||
isStateViewEnable = true
|
||||
setOnItemClickListener { adapter, view, position ->
|
||||
var jumpItem = list.getOrNull(position) ?: return@setOnItemClickListener
|
||||
if (SpTool.cookMode == 0) {
|
||||
jumpItem.dinnerType = dinnerType
|
||||
startActivity<PrepareFoodActivity> {
|
||||
putExtra(PrepareFoodActivity.FOOD_ITEM, jumpItem as Serializable)
|
||||
}
|
||||
return@setOnItemClickListener
|
||||
}
|
||||
val jumpItem = list.getOrNull(position) ?: return@setOnItemClickListener
|
||||
setResult(RESULT_OK, Intent().apply {
|
||||
putExtra(FOOD_ITEM, jumpItem as Serializable)
|
||||
})
|
||||
@@ -73,7 +56,6 @@ class FoodSearchActivity : BaseActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
binding = ActivityFoodSearchBinding.inflate(layoutInflater)
|
||||
setContentView(binding.root)
|
||||
dinnerType = intent.getStringExtra(DINNER_TYPE) ?: "0"
|
||||
setHeaderBackground()
|
||||
foodName = intent.getStringExtra(FOOD_NAME)
|
||||
binding.etInputDish.setText(foodName)
|
||||
@@ -94,31 +76,6 @@ class FoodSearchActivity : BaseActivity() {
|
||||
adapter = recordAdapter
|
||||
}
|
||||
addViewListener()
|
||||
initObserver()
|
||||
}
|
||||
|
||||
/**
|
||||
* 收集 cookOrderPageState，统一处理 Loading / Success / Error 状态
|
||||
*/
|
||||
private fun initObserver() {
|
||||
lifecycleScope.launch {
|
||||
repeatOnLifecycle(Lifecycle.State.STARTED) {
|
||||
netViewModel.cookOrderPageState.collect { state ->
|
||||
when (state) {
|
||||
is UiState.Loading -> showLoading()
|
||||
is UiState.Success -> handleSearchResult(state.data)
|
||||
is UiState.Error -> {
|
||||
delayDismissLoading()
|
||||
finishRefresh()
|
||||
binding.refreshLayout.setEnableRefresh(true)
|
||||
toast(state.msg)
|
||||
loadEmptyView()
|
||||
}
|
||||
is UiState.Idle -> {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun addViewListener() {
|
||||
@@ -164,63 +121,62 @@ class FoodSearchActivity : BaseActivity() {
|
||||
}
|
||||
|
||||
private var pageNo = 1
|
||||
private var pageSize = 10
|
||||
fun getDinnerTypeText(): String {
|
||||
return when (dinnerType) {
|
||||
"1" -> "早餐"
|
||||
"2" -> "午餐"
|
||||
"3" -> "晚餐"
|
||||
else -> "早餐"
|
||||
}
|
||||
}
|
||||
private var pageSize = 20
|
||||
|
||||
@SuppressLint("NotifyDataSetChanged")
|
||||
private fun queryListInfo(input: String) {
|
||||
val request = CookOrderPageRequest(
|
||||
mealType = dinnerType.toIntOrNull(),
|
||||
keyword = input.trim()
|
||||
netViewModel.foodSearch(
|
||||
keyword = input.trim(),
|
||||
pageNum = pageNo,
|
||||
pageSize = pageSize,
|
||||
onLoading = { showLoading() },
|
||||
onResult = { state ->
|
||||
when (state) {
|
||||
is UiState.Success -> handleSearchResult(state.data)
|
||||
is UiState.Error -> {
|
||||
delayDismissLoading()
|
||||
finishRefresh()
|
||||
binding.refreshLayout.setEnableRefresh(true)
|
||||
toast(state.msg)
|
||||
if (pageNo == 1) loadEmptyView()
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
)
|
||||
netViewModel.getCookOrderPage(request = request)
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 CookOrderItem 映射为 FoodRecord，适配现有 Adapter
|
||||
* FoodSearchItem → FoodRecord 映射，供 Food2Adapter 展示
|
||||
* 采样模式下返回给 PrepareFoodActivity 作为称量模板
|
||||
*/
|
||||
private fun CookOrderItem.toFoodRecord(): FoodRecord {
|
||||
return FoodRecord(
|
||||
foodId = foodId,
|
||||
foodName = dishName,
|
||||
totalWeight = ((cookedWeight ?: 0.0) * 1000),
|
||||
foodWeight = ((cookedWeight ?: 0.0) * 1000),
|
||||
count = cookedPortions,
|
||||
cookMode = 0,
|
||||
isCooking = cookStatus == 1,
|
||||
dinnerType = mealType.toString(),
|
||||
isOriginalData = true
|
||||
)
|
||||
}
|
||||
private fun FoodSearchItem.toFoodRecord(): FoodRecord = FoodRecord(
|
||||
foodId = foodId,
|
||||
foodName = foodName,
|
||||
foodCode = foodCode,
|
||||
cookMode = 1
|
||||
)
|
||||
|
||||
/**
|
||||
* 处理搜索结果：从分组响应中 flatten 所有 cookOrders，映射为 FoodRecord 后填充列表
|
||||
* 处理搜索结果：FoodSearchItem → FoodRecord 填充列表
|
||||
*/
|
||||
@SuppressLint("NotifyDataSetChanged")
|
||||
private fun handleSearchResult(groups: List<CookOrderMealGroup>?) {
|
||||
private fun handleSearchResult(items: List<FoodSearchItem>?) {
|
||||
delayDismissLoading()
|
||||
finishRefresh()
|
||||
binding.refreshLayout.setEnableRefresh(true)
|
||||
val records = groups
|
||||
?.flatMap { it.cookOrders }
|
||||
?.map { it.toFoodRecord() }
|
||||
?.toMutableList()
|
||||
if (records.isNullOrEmpty()) {
|
||||
loadEmptyView()
|
||||
if (items.isNullOrEmpty()) {
|
||||
if (pageNo == 1) {
|
||||
loadEmptyView()
|
||||
}
|
||||
return
|
||||
}
|
||||
list.clear()
|
||||
list.addAll(records)
|
||||
if (pageNo == 1) list.clear()
|
||||
list.addAll(items.map { it.toFoodRecord() })
|
||||
recordAdapter.notifyDataSetChanged()
|
||||
// 新接口暂不分页，禁用加载更多
|
||||
binding.refreshLayout.setEnableLoadMore(false)
|
||||
val isLoadMoreEnable = items.size >= pageSize
|
||||
binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
|
||||
if (isLoadMoreEnable) pageNo++
|
||||
}
|
||||
|
||||
private fun finishRefresh() {
|
||||
@@ -249,4 +205,4 @@ class FoodSearchActivity : BaseActivity() {
|
||||
setEnableLoadMore(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,8 +19,9 @@ import com.shuwei.dish.match.base.BaseActivity
|
||||
import com.shuwei.dish.match.databinding.ActivityPrepareFoodBinding
|
||||
import com.shuwei.dish.match.databinding.LayoutCameraPreviewBinding
|
||||
import com.shuwei.dish.match.dialog.CommonDialog
|
||||
import com.shuwei.dish.match.model.CookFoodDTO
|
||||
import com.shuwei.dish.match.dialog.FoodSearchDialog
|
||||
import com.shuwei.dish.match.model.CookOrderCompositionItem
|
||||
import com.shuwei.dish.match.model.FoodCompositionResponse
|
||||
import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
|
||||
import com.shuwei.dish.match.model.FoodRecord
|
||||
import com.shuwei.dish.match.model.GoodsItem
|
||||
@@ -35,6 +36,7 @@ import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
|
||||
import com.shuwei.dish.match.utils.ext.clickWithDebounce
|
||||
import com.shuwei.dish.match.utils.ext.dp
|
||||
import com.shuwei.dish.match.utils.ext.gone
|
||||
import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
|
||||
import com.shuwei.dish.match.utils.ext.startActivity
|
||||
import com.shuwei.dish.match.utils.ext.toJsonString
|
||||
import com.shuwei.dish.match.utils.ext.toast
|
||||
@@ -77,6 +79,12 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
private var pageFrom: String? = null
|
||||
|
||||
private var goodsList: MutableList<CookFoodGoodsEntity>? = null
|
||||
|
||||
/** 食材检索弹窗，手动新增构成时复用 */
|
||||
private var foodSearchDialog: FoodSearchDialog? = null
|
||||
|
||||
/** 手动录入卡当前选中的食材（含 materId），点击搜索后回填 */
|
||||
private var selectedIngredient: GoodsItem? = null
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(binding.root)
|
||||
@@ -111,19 +119,23 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
binding.etInputDish.let {
|
||||
it.setSelection(it.length())
|
||||
}
|
||||
// 采集模式：启用食材信息录入卡（手动新增构成）
|
||||
initIngredientInput()
|
||||
} else {
|
||||
// 制作模式：不可编辑，仅展示菜名
|
||||
binding.etInputDish.isFocusable = false
|
||||
binding.etInputDish.isFocusableInTouchMode = false
|
||||
binding.ivDishSearch.gone()
|
||||
// 制作模式：不展示手动新增卡
|
||||
binding.llIngredientInput.gone()
|
||||
}
|
||||
|
||||
addViewClickListener()
|
||||
addBackKeyListener()
|
||||
// 仅采样模式启用摄像头识别，制作模式不需要
|
||||
if (isSamplingMode) {
|
||||
initCamera(binding.flCameraContainer)
|
||||
}
|
||||
// if (isSamplingMode) {
|
||||
// initCamera(binding.flCameraContainer)
|
||||
// }
|
||||
initRecyclerView()
|
||||
initObserver()
|
||||
|
||||
@@ -136,11 +148,11 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
}
|
||||
|
||||
private fun addViewClickListener() {
|
||||
// binding.tvShowWeight.setOnClickListener {
|
||||
// showLoading("正在清零……")
|
||||
// WeightUtil.tareTwo(AddressUtil.ONE)
|
||||
// delayDismissLoading()
|
||||
// }
|
||||
binding.tvShowWeight.setOnClickListener {
|
||||
showLoading("正在清零……")
|
||||
WeightUtil.tareTwo(AddressUtil.ONE)
|
||||
delayDismissLoading()
|
||||
}
|
||||
// // TODO: 测试功能-------------------------------
|
||||
// binding.btnTestConfirm.clickWithDebounce {
|
||||
// if (currentWeight <= 0.0) return@clickWithDebounce
|
||||
@@ -171,8 +183,11 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
tag = netWeight
|
||||
}
|
||||
}
|
||||
// 仅采样模式触发食材识别
|
||||
// 仅采样模式：用量自动回填秤重 + 触发食材识别
|
||||
if (SpTool.cookMode == 1) {
|
||||
val displayWeight =
|
||||
if (netWeight > 0) netWeight.roundedOneDecimalPlace().toString() else ""
|
||||
binding.etAmount.setText(displayWeight)
|
||||
recognizeFood(netWeight)
|
||||
}
|
||||
}
|
||||
@@ -320,8 +335,8 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
val hasOriginalData = list.any { it.isOriginalData }
|
||||
// 接口数据中主材数量
|
||||
val n = list.count { it.isOriginalData && it.materialType == 1 }
|
||||
// 待分配的非接口数据
|
||||
val nonOriginalList = list.filter { !it.isOriginalData }
|
||||
// 待分配的非接口数据（跳过手动指定过主辅材的项）
|
||||
val nonOriginalList = list.filter { !it.isOriginalData && !it.isMaterialTypeManual }
|
||||
|
||||
if (hasOriginalData && MATERIAL_COUNT - n <= 0) {
|
||||
// 主材已满，所有非接口数据均为辅材
|
||||
@@ -338,6 +353,79 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
materialAdapter.notifyDataSetChanged()
|
||||
}
|
||||
|
||||
/**
|
||||
* 食材信息录入卡初始化（仅采样模式）：
|
||||
* 搜索食材 → 选中回填名称并暂存 GoodsItem（含 materId）→ 选择主辅材 → 输入用量 → 添加
|
||||
*/
|
||||
private fun initIngredientInput() {
|
||||
binding.ivIngredientSearch.setOnClickListener { openIngredientSearch() }
|
||||
binding.etIngredientName.setOnClickListener { openIngredientSearch() }
|
||||
binding.btnReset.setOnClickListener {
|
||||
binding.etAmount.setText("")
|
||||
}
|
||||
binding.btnAdd.clickWithDebounce {
|
||||
addManualIngredient()
|
||||
}
|
||||
}
|
||||
|
||||
/** 打开食材检索弹窗（食材名称不可手输，点击即搜索） */
|
||||
private fun openIngredientSearch() {
|
||||
if (foodSearchDialog?.isShowing == true) return
|
||||
foodSearchDialog = FoodSearchDialog(
|
||||
activity = this,
|
||||
onItemSelected = { item -> onIngredientSelected(item) }
|
||||
).also { it.show() }
|
||||
}
|
||||
|
||||
/**
|
||||
* 食材检索选中回调：回填名称，暂存 GoodsItem（materId 用于提交）
|
||||
*/
|
||||
private fun onIngredientSelected(item: GoodsItem) {
|
||||
selectedIngredient = item
|
||||
binding.etIngredientName.setText(item.goodsName)
|
||||
}
|
||||
|
||||
/**
|
||||
* 手动添加食材到构成列表：名称（materId）+ 主辅材 + 用量（克，取自秤重）
|
||||
*/
|
||||
private fun addManualIngredient() {
|
||||
val ingredient = selectedIngredient
|
||||
if (ingredient == null || ingredient.materId.isNullOrBlank()) {
|
||||
toast("请先搜索选择食材")
|
||||
return
|
||||
}
|
||||
val amount = currentWeight.roundedOneDecimalPlace()
|
||||
if (amount <= 0) {
|
||||
toast("请先称重获取用量")
|
||||
return
|
||||
}
|
||||
val type = if (binding.rbAux.isChecked) 2 else 1
|
||||
val existing = list.firstOrNull { it.goodsId == ingredient.goodsId }
|
||||
if (existing != null) {
|
||||
// 已存在同食材：累加用量并同步主辅材
|
||||
existing.useWeight = (existing.useWeight ?: 0.0) + amount
|
||||
existing.materialType = type
|
||||
existing.isMaterialTypeManual = true
|
||||
existing.isSetFinished = true
|
||||
existing.isNewDishType = true
|
||||
} else {
|
||||
ingredient.materialType = type
|
||||
ingredient.useWeight = amount
|
||||
ingredient.isMaterialTypeManual = true
|
||||
ingredient.isNewDishType = true
|
||||
ingredient.isOriginalData = false
|
||||
ingredient.isSetFinished = true
|
||||
ingredient.isClicked = false
|
||||
list.add(ingredient)
|
||||
binding.rvMaterialList.smoothScrollToPosition(list.size - 1)
|
||||
}
|
||||
// 清空录入区
|
||||
selectedIngredient = null
|
||||
binding.etIngredientName.setText("")
|
||||
binding.etAmount.setText("")
|
||||
updateMaterialTypes()
|
||||
}
|
||||
|
||||
private fun openSubmitPage() {
|
||||
getGoodsList()
|
||||
if (goodsList.isNullOrEmpty()) {
|
||||
@@ -378,23 +466,6 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
|
||||
|
||||
private fun initObserver() {
|
||||
// 旧接口 observer（采样模式使用）
|
||||
lifecycleScope.launch {
|
||||
netViewModel.foodDetailState.collect { state ->
|
||||
when (state) {
|
||||
is UiState.Success -> {
|
||||
val detail = state.data
|
||||
if (detail == null) {
|
||||
toast("查询菜品信息为空")
|
||||
return@collect
|
||||
}
|
||||
loadDishDetail(detail)
|
||||
}
|
||||
is UiState.Error -> toast(state.msg)
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
}
|
||||
// 新配比秤接口 observer（制作模式使用）
|
||||
lifecycleScope.launch {
|
||||
netViewModel.cookOrderCompositionState.collect { state ->
|
||||
@@ -414,9 +485,25 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 旧接口：通过 foodId 查询菜品构成（采样模式使用） */
|
||||
/** 新接口：通过 foodId 查询菜品构成（采样模式称量模板） */
|
||||
private fun getDishDetail(foodId: String) {
|
||||
netViewModel.getFoodDetail(foodId)
|
||||
netViewModel.getFoodComposition(
|
||||
foodId = foodId,
|
||||
onResult = { state ->
|
||||
when (state) {
|
||||
is UiState.Success -> {
|
||||
val response = state.data
|
||||
if (response == null) {
|
||||
toast("查询菜品构成为空")
|
||||
} else {
|
||||
loadFoodComposition(response)
|
||||
}
|
||||
}
|
||||
is UiState.Error -> toast(state.msg)
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
/** 新接口：通过 cookOrderId 查询菜品食材构成（制作模式使用） */
|
||||
@@ -425,17 +512,23 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
}
|
||||
|
||||
|
||||
private fun loadDishDetail(detail: CookFoodDTO) {
|
||||
// val voList = detail.stFoodInfoConstituteList
|
||||
val voList = detail.foodConstituteList
|
||||
if (voList.isNullOrEmpty()) {
|
||||
return
|
||||
}
|
||||
// 筛选出主材和辅材，转换为 GoodsItem（useWeight 置零）
|
||||
val tempData = voList.filter { it.materialType == 1 || it.materialType == 2 }
|
||||
.map { it.toGoodsItem().also { item -> item.useWeight = 0.0 } }
|
||||
// 直接替换 adapter.items，确保 adapter 数据源被完全替换
|
||||
// 同时同步外部 list，保证后续 updateMaterialTypes/removeFood 等操作正确
|
||||
/**
|
||||
* 采样模式：将 food/{foodId}/composition 返回的构成映射为 GoodsItem 并刷新 UI
|
||||
* 筛选主材(1)/辅材(2)，调料(3)仍走槽位秤；useWeight 置零待重新称量
|
||||
*/
|
||||
private fun loadFoodComposition(response: FoodCompositionResponse) {
|
||||
val tempData = response.ingredients
|
||||
.filter { it.isMain == 1 || it.isMain == 2 }
|
||||
.map {
|
||||
GoodsItem(
|
||||
goodsId = it.materId,
|
||||
materId = it.materId,
|
||||
goodsName = it.materName,
|
||||
materialType = it.isMain,
|
||||
useWeight = 0.0,
|
||||
isOriginalData = true
|
||||
)
|
||||
}
|
||||
list.clear()
|
||||
list.addAll(tempData)
|
||||
materialAdapter.items = list
|
||||
@@ -475,13 +568,11 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
list.forEachIndexed { index, entity ->
|
||||
entity.isClicked = index == position
|
||||
}
|
||||
// 制作模式：选中食材时同步当前秤重
|
||||
if (SpTool.cookMode == 0) {
|
||||
val item = list.getOrNull(position)
|
||||
if (item != null && currentWeight > 0) {
|
||||
item.useWeight = currentWeight
|
||||
item.isSetFinished = true
|
||||
}
|
||||
// 选中食材时同步当前秤重（制作/采样均支持）
|
||||
val item = list.getOrNull(position)
|
||||
if (item != null && currentWeight > 0) {
|
||||
item.useWeight = currentWeight
|
||||
item.isSetFinished = true
|
||||
}
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
@@ -519,9 +610,9 @@ class PrepareFoodActivity : BaseActivity() {
|
||||
private fun initRecyclerView() {
|
||||
binding.rvMaterialList.let {
|
||||
it.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
|
||||
// 仅 isNewDishType=true 的 item 显示侧滑删除菜单（必须在 setAdapter 之前调用）
|
||||
// 采样模式下所有食材均可侧滑删除（必须在 setAdapter 之前调用）
|
||||
it.setSwipeMenuCreator { _, rightMenu, position ->
|
||||
if (list.getOrNull(position)?.isNewDishType == true) {
|
||||
if (SpTool.cookMode == 1) {
|
||||
rightMenu.addMenuItem(buildDeleteMenuItem())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,11 +13,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.shuwei.dish.match.R
|
||||
import com.shuwei.dish.match.adapter.FoodListAdapter
|
||||
import com.shuwei.dish.match.base.BaseActivity
|
||||
import com.shuwei.dish.match.base.BaseApp
|
||||
import com.shuwei.dish.match.databinding.ActivitySamplingModeBinding
|
||||
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
|
||||
import com.shuwei.dish.match.dialog.CommonDialog
|
||||
import com.shuwei.dish.match.model.FoodRecord
|
||||
import com.shuwei.dish.match.model.SampleHistoryItem
|
||||
import com.shuwei.dish.match.net.UiState
|
||||
import com.shuwei.dish.match.utils.DateTimeUtil
|
||||
import com.shuwei.dish.match.utils.ext.dp
|
||||
@@ -251,12 +251,9 @@ class SamplingModeActivity : BaseActivity() {
|
||||
|
||||
@SuppressLint("NotifyDataSetChanged")
|
||||
fun getSamplingList() {
|
||||
netViewModel.getSamplingListWithCallback(
|
||||
param = mutableMapOf(
|
||||
"pageNum" to pageNo,
|
||||
"pageSize" to pageSize,
|
||||
"placeId" to BaseApp.canteenId
|
||||
),
|
||||
netViewModel.sampleHistory(
|
||||
pageNum = pageNo,
|
||||
pageSize = pageSize,
|
||||
onLoading = { showLoading() }
|
||||
) { state ->
|
||||
when (state) {
|
||||
@@ -264,14 +261,14 @@ class SamplingModeActivity : BaseActivity() {
|
||||
// 回调期间用户可能已切换 Tab，需再次校验
|
||||
if (binding.rbSamplingFinished.isChecked.not()) {
|
||||
delayDismissLoading()
|
||||
return@getSamplingListWithCallback
|
||||
return@sampleHistory
|
||||
}
|
||||
loadDishList(state.data)
|
||||
loadDishList(state.data?.map { it.toFoodRecord() }?.toMutableList())
|
||||
}
|
||||
is UiState.Error -> {
|
||||
if (binding.rbSamplingFinished.isChecked.not()) {
|
||||
delayDismissLoading()
|
||||
return@getSamplingListWithCallback
|
||||
return@sampleHistory
|
||||
}
|
||||
binding.refreshLayout.setEnableRefresh(true)
|
||||
toast(state.msg)
|
||||
@@ -284,6 +281,18 @@ class SamplingModeActivity : BaseActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
/** 采样历史条目 → FoodRecord 映射，供 FoodListAdapter(SAMPLING_MODE) 展示 */
|
||||
private fun SampleHistoryItem.toFoodRecord(): FoodRecord = FoodRecord(
|
||||
foodId = foodId,
|
||||
foodName = foodName,
|
||||
foodWeight = foodWeight,
|
||||
cookMode = 1,
|
||||
foodCode = foodCode,
|
||||
auditStatus = auditStatus,
|
||||
auditStatusName = auditStatusName,
|
||||
auditRecordId = auditRecordId
|
||||
)
|
||||
|
||||
private fun finishRefresh() {
|
||||
if (pageNo == 1) {
|
||||
binding.refreshLayout.finishRefresh(1200)
|
||||
|
||||
@@ -21,6 +21,9 @@ import com.shuwei.dish.match.dialog.CommonDialog
|
||||
import com.shuwei.dish.match.dialog.GoodsPreviewDialog
|
||||
import com.shuwei.dish.match.db.entity.CookFoodEntity
|
||||
import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
|
||||
import com.shuwei.dish.match.model.ConstituteCookMode
|
||||
import com.shuwei.dish.match.model.ConstituteSaveItem
|
||||
import com.shuwei.dish.match.model.ConstituteSaveRequest
|
||||
import com.shuwei.dish.match.model.CookCompleteItem
|
||||
import com.shuwei.dish.match.model.CookCompleteRequest
|
||||
import com.shuwei.dish.match.model.FoodRecord
|
||||
@@ -375,7 +378,7 @@ class SubmitFoodActivity : BaseActivity() {
|
||||
|
||||
// 监听主设备 2格秤的熟重
|
||||
WeightUtil.addWeightListener(TAG) { address, _, weight ->
|
||||
if (address == AddressUtil.TWO) {
|
||||
if (address == AddressUtil.ONE) {
|
||||
// 首次收到数据时记录初始重量
|
||||
// if (!initWeightSet) {
|
||||
// initWeight = weight
|
||||
@@ -456,7 +459,13 @@ class SubmitFoodActivity : BaseActivity() {
|
||||
return@launch
|
||||
}
|
||||
|
||||
// 旧接口路径（采样模式 / 无烹制单 ID）
|
||||
// 采样模式 → 调新配比秤提交构成接口（cookMode=2，从零建菜，进入待审核）
|
||||
if (food?.cookMode == 1) {
|
||||
submitConstitute()
|
||||
return@launch
|
||||
}
|
||||
|
||||
// 旧接口路径（无烹制单 ID 的制作模式兜底）
|
||||
cookFoodEntity.let {
|
||||
it.matchingConstituteInfoList = this@SubmitFoodActivity.goodsList
|
||||
it.dinnerType = when (it.dinnerType) {
|
||||
@@ -537,6 +546,73 @@ class SubmitFoodActivity : BaseActivity() {
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 采样提交：从 goodsList 提取全部构成（主材/辅材/调料），组装 ConstituteSaveRequest 提交
|
||||
* cookMode=2(采样)，熟重 foodWeight 单位为 g，isMain 直接取 materialType(1主/2辅/3调)
|
||||
*/
|
||||
private fun submitConstitute() {
|
||||
val allGoods = goodsList ?: run {
|
||||
toast("未获取到菜品或构成信息")
|
||||
dismissLoading()
|
||||
return
|
||||
}
|
||||
val foodName = cookFoodEntity.foodName ?: food?.foodName ?: ""
|
||||
if (foodName.isBlank()) {
|
||||
toast("菜品名称为空")
|
||||
dismissLoading()
|
||||
return
|
||||
}
|
||||
|
||||
// 仅保留用量 > 0 的食材；materId 优先取 materId，为空时回退 goodsId
|
||||
val items = allGoods
|
||||
.filter { (it.useWeight ?: 0.0) > 0.0 }
|
||||
.map {
|
||||
ConstituteSaveItem(
|
||||
materId = it.materId?.takeIf { mid -> mid.isNotEmpty() } ?: it.goodsId,
|
||||
useWeight = it.useWeight ?: 0.0,
|
||||
isMain = it.materialType
|
||||
)
|
||||
}
|
||||
if (items.isEmpty()) {
|
||||
toast("请完善菜品构成信息")
|
||||
dismissLoading()
|
||||
return
|
||||
}
|
||||
if (items.any { it.materId.isBlank() }) {
|
||||
toast("菜品食材不能为空")
|
||||
dismissLoading()
|
||||
return
|
||||
}
|
||||
val foodWeight = cookFoodEntity.foodWeight
|
||||
if (foodWeight <= 0.0) {
|
||||
toast("熟重必须大于0")
|
||||
dismissLoading()
|
||||
return
|
||||
}
|
||||
|
||||
val request = ConstituteSaveRequest(
|
||||
cookMode = ConstituteCookMode.SAMPLE,
|
||||
foodName = foodName,
|
||||
foodWeight = foodWeight,
|
||||
items = items
|
||||
)
|
||||
Log.d(TAG, "submitConstitute: ${request.toJsonString()}")
|
||||
|
||||
netViewModel.constituteSave(
|
||||
request = request,
|
||||
onResult = { state ->
|
||||
when (state) {
|
||||
is UiState.Success -> submitSuccess(isSamplingData = true)
|
||||
is UiState.Error -> {
|
||||
toast(state.msg)
|
||||
dismissLoading()
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 adapter 中的调料 item 转换为 CookFoodGoodsEntity
|
||||
* 从本地 dm_seasoning 表补充完整字段（popularName、zjmCode、materId、goodsCode 等）
|
||||
|
||||
@@ -224,7 +224,10 @@ class FoodListFragment : BaseFragment<FragmentFoodListBinding>() {
|
||||
currentJob?.cancel()
|
||||
currentJob = viewLifecycleOwner.lifecycleScope.launch {
|
||||
// 首次加载传 mealType=null 获取所有餐次，切换 Tab 时传当前餐次精确请求
|
||||
val mealType = if (isFirstLoad) null else dinnerType.toIntOrNull()
|
||||
val mealType = if (isFirstLoad) null else when (dinnerType) {
|
||||
"1", "2", "3", "4" -> dinnerType.toInt()
|
||||
else -> null // "0" 或非法值不传，由后端返回全部餐次
|
||||
}
|
||||
val request = CookOrderPageRequest(
|
||||
mealType = mealType,
|
||||
keyword = foodName
|
||||
|
||||
@@ -51,6 +51,178 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- 食材信息录入卡：手动新增菜品构成 -->
|
||||
<LinearLayout
|
||||
android:id="@+id/llIngredientInput"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="30dp"
|
||||
android:layout_marginBottom="30dp"
|
||||
android:background="@drawable/shape_white_30_corners"
|
||||
android:orientation="vertical"
|
||||
android:padding="20dp">
|
||||
|
||||
<!-- 食材名称 -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/dish_name"
|
||||
android:textColor="@color/black666"
|
||||
android:textSize="28sp" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/etIngredientName"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="80dp"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_weight="1"
|
||||
android:autofillHints=""
|
||||
android:background="@drawable/shape_white_f6_10_corners"
|
||||
android:clickable="true"
|
||||
android:ellipsize="end"
|
||||
android:focusable="false"
|
||||
android:focusableInTouchMode="false"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="@string/click_search_ingredient"
|
||||
android:maxLines="1"
|
||||
android:paddingHorizontal="20dp"
|
||||
android:textColor="@color/black333"
|
||||
android:textColorHint="@color/gray_c8"
|
||||
android:textSize="30sp"
|
||||
tools:ignore="TextFields" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivIngredientSearch"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="70dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:padding="20dp"
|
||||
android:src="@drawable/ic_search_green"
|
||||
tools:ignore="ContentDescription" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- 主辅材 -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/dish_from_type"
|
||||
android:textColor="@color/black666"
|
||||
android:textSize="28sp" />
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/rgMainAux"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/rbMain"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
android:button="@null"
|
||||
android:checked="true"
|
||||
android:drawablePadding="20dp"
|
||||
android:drawableStart="@drawable/selector_dish_type"
|
||||
android:gravity="center"
|
||||
android:paddingHorizontal="30dp"
|
||||
android:text="@string/dish_type_first"
|
||||
android:textColor="@color/dish_type_font"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/rbAux"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
android:button="@null"
|
||||
android:drawablePadding="20dp"
|
||||
android:drawableStart="@drawable/selector_dish_type"
|
||||
android:gravity="center"
|
||||
android:paddingHorizontal="30dp"
|
||||
android:text="@string/dish_type_second"
|
||||
android:textColor="@color/dish_type_font"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold" />
|
||||
</RadioGroup>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- 用量（克） -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/dish_part_weight_remind"
|
||||
android:textColor="@color/black666"
|
||||
android:textSize="28sp" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/etAmount"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="80dp"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_weight="1"
|
||||
android:autofillHints=""
|
||||
android:background="@drawable/shape_white_f6_10_corners"
|
||||
android:focusable="false"
|
||||
android:focusableInTouchMode="false"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="@string/weight_from_scale"
|
||||
android:maxLines="1"
|
||||
android:paddingHorizontal="20dp"
|
||||
android:textColor="@color/black333"
|
||||
android:textColorHint="@color/gray_c8"
|
||||
android:textSize="30sp"
|
||||
tools:ignore="TextFields" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/btnReset"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:padding="10dp"
|
||||
android:text="@string/clear_zero"
|
||||
android:textColor="@color/red_ff4444"
|
||||
android:textSize="28sp"
|
||||
android:visibility="gone" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/btnAdd"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="70dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:background="@drawable/shape_green_bg"
|
||||
android:gravity="center"
|
||||
android:paddingHorizontal="40dp"
|
||||
android:text="@string/add"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
|
||||
@@ -35,4 +35,8 @@
|
||||
<string name="dish_type_first">主材</string>
|
||||
<string name="add_sampling">新增采样</string>
|
||||
<string name="add_food">添加食材</string>
|
||||
<string name="clear_zero">清零</string>
|
||||
<string name="add">添加</string>
|
||||
<string name="click_search_ingredient">点击搜索食材</string>
|
||||
<string name="weight_from_scale">称重获取</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user