From d82252f08a32f5786ffe231b7fd301b6a60781d6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 07 三月 2026 17:56:58 +0800
Subject: [PATCH] 解决代码冲突更新WCS日志记录
---
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs | 4 ----
1 files changed, 0 insertions(+), 4 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 48b15d7..a6006d4 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,11 +45,7 @@
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