From 74fcd65f1b511daeea003a6f97b3436529b3103e Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Thu, 4 Jun 2026 18:09:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(inbound):=20=E4=BF=AE=E6=AD=A3=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E4=BF=9D=E8=B4=A8=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 提取入库时间变量避免重复计算
- 为保质期字段添加时间部分，格式化为日期+时间
- 确保时间格式与系统ISO标准保持一致
- 优化参数传递过程中的数据处理流程
---
 .../java/com/sw/inbound/dialog/InboundGoodsStoreDialog.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/sw/inbound/dialog/InboundGoodsStoreDialog.kt b/app/src/main/java/com/sw/inbound/dialog/InboundGoodsStoreDialog.kt
index 8332167..89e8ca4 100644
--- a/app/src/main/java/com/sw/inbound/dialog/InboundGoodsStoreDialog.kt
+++ b/app/src/main/java/com/sw/inbound/dialog/InboundGoodsStoreDialog.kt
@@ -342,9 +342,13 @@ class InboundGoodsStoreDialog(
         // weight 来自秤，不在表单中，额外注入
         param["weight"] = realWeight / 1000.0
         // inboundTime 净菜取当前时间，不在表单中
-        param["inboundTime"] = isoFormat.format(Date())
+        val inboundTime = isoFormat.format(Date())
+        param["inboundTime"] = inboundTime
         param["materId"] = goods?.materId ?:""
 
+        val expiryDate = param["expiryDate"] as? String
+        param["expiryDate"] = expiryDate + " " + inboundTime.split(" ").getOrNull(1)
+
         Loading.show(storeActivity ?: return)
         storeActivity?.storeViewModel?.submitCleanInbound(param) { success, msg ->
             Loading.dismiss()