From 635a49022f9f2dc3047456a63cd5f380c6724f87 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期五, 27 三月 2026 11:21:16 +0800
Subject: [PATCH] 新增MES领料计划单页面，修复出库详情单据类型的显示

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

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
index d099901..9ae1d8a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
@@ -7,13 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-<<<<<<< HEAD
     <ProjectReference Include="..\WIDESEAWCS_IPackInfoService\WIDESEAWCS_IPackInfoService.csproj" />
-=======
     <ProjectReference Include="..\WIDESEAWCS_IBasicInfoRepository\WIDESEAWCS_IBasicInfoRepository.csproj" />
     <ProjectReference Include="..\WIDESEAWCS_IPackInfoService\WIDESEAWCS_IPackInfoService.csproj" />
     <ProjectReference Include="..\WIDESEAWCS_ITaskInfoRepository\WIDESEAWCS_ITaskInfoRepository.csproj" />
->>>>>>> main
   </ItemGroup>
 
 </Project>

--
Gitblit v1.9.3