From 41961aaa4f4915890404a69f75d3bd8e46989df4 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 22 八月 2024 16:03:16 +0800
Subject: [PATCH] 包装更新
---
Tiger.Api/Language.db | 0
Tiger.Business.MES/WorkAction/PackingAction.cs | 7 +++++--
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Tiger.Api/Language.db b/Tiger.Api/Language.db
index b309d15..5cc7c85 100644
--- a/Tiger.Api/Language.db
+++ b/Tiger.Api/Language.db
Binary files differ
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 60fe6f5..b87f18b 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -711,8 +711,11 @@
}
}
//璁板綍澶栧寘瑁呯殑绉伴噸鏁版嵁
- CurPkg.Item.Package.WEIGHT = CurPkg.WeightInfo.Weight;
- CurPkg.Item.Package.WEIGHT_UNIT = CurPkg.WeightInfo.Unit;
+ if (CurPkg.IsFinished)
+ {
+ CurPkg.Item.Package.WEIGHT = CurPkg.WeightInfo.Weight;
+ CurPkg.Item.Package.WEIGHT_UNIT = CurPkg.WeightInfo.Unit;
+ }
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _wipActs = wipActs.Clone();
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 9567167..133dc6b 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -159,7 +159,7 @@
public string RULE_NAME { get; set; }
public WipPkgItem Item { get; set; }
public bool IsWeighed { get; set; } = false;
- public WeightInfo WeightInfo { get; set; }
+ public WeightInfo WeightInfo { get; set; } = new WeightInfo();
public bool IsFinished => Item.IsFinished;
}
--
Gitblit v1.9.3