root
/
ldj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: root:ebc38709b157125954f7fed71230b4d9f8c44c7c
Branches Tags
root:main
root:ldjO
root:ldjadv
root:medicine
root:ldj
..
compare: root:d53d6ef76cdc68748d9413d3529e03d199b4c070
Branches Tags
root:ldjO
root:ldjadv
root:medicine
root:ldj
root:main

2 Commits
ebc38709b1 ... d53d6ef76c

Author SHA1 Message Date
bobwang d53d6ef76c Merge branch 'medicine' of http://deiniusoft.com:3000/root/ldj into medicine 2024-10-27 23:47:52 +08:00
bobwang 67fcfbba69 testMerge branch 'master' of http://deiniusoft.com:3000/root/ldj 2024-10-27 23:47:46 +08:00
7 changed files with 6 additions and 44 deletions
Show Stats Expand all files Collapse all files

2
WcfService1/WmsWcfService.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

2
WcfServiceErp/WcfServiceErp.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>IISProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>IISProfile</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>

2
WcfServicePortal/WcfServicePortal.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

BIN
WebApplication1/obj/Release/WebApplication1.csproj.AssemblyReference.cache
View File

Binary file not shown.

41
deiniuWMS.sln
View File

@ -88,28 +88,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfServiceErp", "WcfService
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRest", "WebRest\WebRest.csproj", "{3F42360F-7468-48A1-9535-2DB50E0BFA4B}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRest", "WebRest\WebRest.csproj", "{3F42360F-7468-48A1-9535-2DB50E0BFA4B}"
EndProject EndProject
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "view", "view\", "{8288A0EA-E086-4EB8-AD75-D4038F5E5243}"
ProjectSection(WebsiteProperties) = preProject
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
ProjectReferences = "{3d2895be-0dc7-464e-a7bc-be7980a9e70e}|conn.dll;{151F88A4-82D0-4E30-A9B5-AB0B0ADA1FBD}|Utils.dll;{d756ee47-e7e0-4dbc-8bad-6ac744f00d4f}|BaseObject.dll;{2A0D6C89-2BCE-4EBE-A4E0-7056A10A45CE}|myLog.dll;{d02e3cad-bff0-40d3-964c-18551410683e}|Model.dll;{9cad4cf0-bd54-46d4-b640-13fde3d58dd9}|Logical.dll;{CA44F42F-4376-4BC6-9EA4-821DB704C75D}|WcfServiceAuthentication.dll;"
Debug.AspNetCompiler.VirtualPath = "/localhost_52455"
Debug.AspNetCompiler.PhysicalPath = "view\"
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_52455\"
Debug.AspNetCompiler.Updateable = "true"
Debug.AspNetCompiler.ForceOverwrite = "true"
Debug.AspNetCompiler.FixedNames = "false"
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.VirtualPath = "/localhost_52455"
Release.AspNetCompiler.PhysicalPath = "view\"
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_52455\"
Release.AspNetCompiler.Updateable = "true"
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
VWDPort = "52455"
SlnRelativePath = "view\"
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{0733D196-F4F2-4152-ADFA-3903E897C0C6}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{0733D196-F4F2-4152-ADFA-3903E897C0C6}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
得牛WMS.pptx = 得牛WMS.pptx 得牛WMS.pptx = 得牛WMS.pptx
@ -429,22 +407,6 @@ Global
{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.ActiveCfg = Release|Any CPU {3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.ActiveCfg = Release|Any CPU
{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.Build.0 = Release|Any CPU {3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.Build.0 = Release|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|.NET.ActiveCfg = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|.NET.Build.0 = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|x86.ActiveCfg = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Debug|x86.Build.0 = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|.NET.ActiveCfg = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|.NET.Build.0 = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|Any CPU.Build.0 = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|x86.ActiveCfg = Debug|Any CPU
{8288A0EA-E086-4EB8-AD75-D4038F5E5243}.Release|x86.Build.0 = Debug|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -477,10 +439,9 @@ Global
{7D96FE49-C422-44B4-A182-547066320802} = {5415AFB3-A170-4765-AD4F-2B1FD3F47D5F} {7D96FE49-C422-44B4-A182-547066320802} = {5415AFB3-A170-4765-AD4F-2B1FD3F47D5F}
{A1A890CA-74D8-4D5A-9E76-90185A21343D} = {1A958873-21C7-49B8-89B4-4B59CF99334C} {A1A890CA-74D8-4D5A-9E76-90185A21343D} = {1A958873-21C7-49B8-89B4-4B59CF99334C}
{3F42360F-7468-48A1-9535-2DB50E0BFA4B} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A} {3F42360F-7468-48A1-9535-2DB50E0BFA4B} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
{8288A0EA-E086-4EB8-AD75-D4038F5E5243} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A}
VisualSVNWorkingCopyRoot = . VisualSVNWorkingCopyRoot = .
SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

2
epickService/epickService.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress> <UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

1
winform/epick/SeedsOutService.cs
View File

@ -38,6 +38,7 @@ namespace DeiNiu.wms.win
public static List<ELabel> labelPool = new List<ELabel>(); public static List<ELabel> labelPool = new List<ELabel>();
string svrUrl = "http://127.0.0.1:9998/DNLight"; string svrUrl = "http://127.0.0.1:9998/DNLight";
//this is for medicine branch test
// lWmslocation lgt = new lWmslocation(); // lWmslocation lgt = new lWmslocation();
// private string fieldName = Wmslocation.fields.locationId.ToString(); // private string fieldName = Wmslocation.fields.locationId.ToString();