From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新

---
 项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs"
index 4e7e336..48b15d7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs"
@@ -45,7 +45,11 @@
                     Dt_PackType? packType = packTypes.FirstOrDefault(x=>x.PackWidth==item.Width && x.PackLength==item.Length && x.PackHeight==item.Height);
                     if (packType == null) throw new Exception($"鏈壘鍒版潯鐮亄item.BarCode},{item.Length}*{item.Width}*{item.Height}鐮佸灈閰嶇疆");
                     Dt_Packinfo packinfo = _mapper.Map<Dt_Packinfo>(item);
+<<<<<<< HEAD
                     packinfo.PackType = packType.id;
+=======
+                    packinfo.PackType = packType.Id;
+>>>>>>> main
                     packinfos.Add(packinfo);
                 }
                 BaseDal.AddData(packinfos);

--
Gitblit v1.9.3