形态转换

2 months ago · 1f4dcae943
7 changed files with 182 additions and 1 deletions
--- a/ICSSoft.ERP.WebAPI/ICSSoft.ERP.WebAPI/log4net.dll
+++ b/ICSSoft.ERP.WebAPI/ICSSoft.ERP.WebAPI/log4net.dll
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSoft.DataProject.csproj.bak
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSoft.DataProject.csproj.bak
@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9D26A712-D243-4E25-A473-61C5C2D9ED6A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ICSSoft.DataProject</RootNamespace>
+    <AssemblyName>ICSSoft.DataProject</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ICSSoft.WebAPI\bin\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CreateAppVouch.cs" />
+    <Compile Include="CreatePOArrive.cs" />
+    <Compile Include="CreatePoMain.cs" />
+    <Compile Include="CreatePOTest.cs" />
+    <Compile Include="CreateWareHouseLotInfo.cs" />
+    <Compile Include="ICSUserPowerService.cs" />
+    <Compile Include="DeliveryNoteDBService.cs" />
+    <Compile Include="ICSLibrary.cs" />
+    <Compile Include="ICSTransferBox.cs" />
+    <Compile Include="ICSUserPowerService.cs" />
+    <Compile Include="ICSWMSVersions.cs" />
+    <Compile Include="OutsourcingSevice.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="WMSBarCoreService.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ICSSoft.Common\ICSSoft.Common.csproj">
+      <Project>{ee45f7a5-17ee-4707-a617-8c00dd36fc01}</Project>
+      <Name>ICSSoft.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSSoft.Entity\ICSSoft.Entity.csproj">
+      <Project>{834E9A76-1D9E-4EBD-9321-0B362A06A367}</Project>
+      <Name>ICSSoft.Entity</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSSoft.IEntity\ICSSoft.IEntity.csproj">
+      <Project>{f6aff3ca-fe19-4fbc-810b-dd5a4eb0e806}</Project>
+      <Name>ICSSoft.IEntity</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
--- a/WMS-BS/NFine.Application/WMS/ICSMTDOCApp.cs
+++ b/WMS-BS/NFine.Application/WMS/ICSMTDOCApp.cs
@ -284,7 +284,8 @@ namespace NFine.Application.WMS

                string LotNo = jo["LotNo"].ToString();

-                string sqls = @"select max(LotNo) as NewLotNo from ICSInventoryLot where EATTRIBUTE1='{0}' ";
+                string sqls = @"select top 1  LotNo  as NewLotNo from ICSInventoryLot where EATTRIBUTE1='{0}'
+ ORDER BY CAST(SUBSTRING(LotNO, (LEN(LotNO)-CHARINDEX('-',REVERSE(LotNO))+1)+1,CHARINDEX('-',REVERSE(LotNO))-1) AS INT) DESC  ";
                sqls = string.Format(sqls, LotNo);
                dt = Repository().FindTableBySql(sqls.ToString());
                if (dt == null || dt.Rows.Count == 0 || dt.Rows[0]["NewLotNo"].ToString() == "")
--- a/WMS-BS/NFine.Web/Frp/PrintActivex.exe
+++ b/WMS-BS/NFine.Web/Frp/PrintActivex.exe
--- a/WMS-BS/NFine.Web/NFine.Web.csproj
+++ b/WMS-BS/NFine.Web/NFine.Web.csproj
@ -588,6 +588,92 @@
    <Content Include="Areas\WMS\Views\BasicSettings\ICSInventoryInspectionGroupAdd.cshtml" />
    <Content Include="Areas\WMS\Views\BasicSettings\ICSSearchInventory.cshtml" />
    <Content Include="Areas\WMS\Views\Deciliter\LotNoRemark.cshtml" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211022160658299029.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211022161144722927.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211022161207717811.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211022161259924655.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211022161658930250.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp2021102216215474076.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211022164519497665.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211027103328195171.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211029111806729277.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp20211029161341422294.txt" />
+    <Content Include="WMS\BasicSettings\PrintTemp\PrintTemp2021102916144187293.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506134802117864.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506134822501998.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506134926561866.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506134943861940.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506135354918965.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506135413271535.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506135958485807.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp202205061400584659.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506140919944221.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506141346342791.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506141437462431.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506141559157102.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp2022050614165565204.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506141756476154.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220506141840402635.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220507102010340698.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512112329154893.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512113039392195.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512113133111638.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512113308676804.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512113709769681.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp2022051211375026550.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512114746904175.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp2022051211572784754.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512133425311881.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512135327644486.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512135352764821.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512135417199189.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512140334757860.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512150545998770.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512150738202121.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512151101756860.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512151225821282.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512151427549295.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512151830276921.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512152001283676.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512152026665705.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512152519157311.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512153235200626.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512153543250201.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512162941386355.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220512162957229550.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220513085116624329.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp2022051309005849208.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220513110141373052.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220513110419164852.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220513110745131776.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220524164851133464.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220609150816270480.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220609161849287412.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220801161809652683.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220905171815935757.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220905171824798451.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220905172350754041.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220906112850250797.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220920162152103975.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220920162218559117.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220920162421193399.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220920162931967684.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220920163133197348.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220920163455574297.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp2022092016372723567.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220922112249313747.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220922112347128118.txt" />
+    <Content Include="WMS\Print\PrintTemp\PrintTemp20220922112658669594.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513101511687599.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513101521783725.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513101538115442.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513101843446366.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513102058452638.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513102216320678.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513102324921484.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513102411646255.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513102549773056.txt" />
+    <Content Include="WMS\WMSCreateItemLot\PrintTemp\PrintTemp20220513102751375696.txt" />
    <None Include="Scripts\jquery-1.10.2.intellisense.js" />
    <Content Include="Scripts\jquery-1.10.2.js" />
    <Content Include="Scripts\jquery-1.10.2.min.js" />
--- a/WMS-BS/NFine.Web/PrintActivex.exe
+++ b/WMS-BS/NFine.Web/PrintActivex.exe
--- a/WMS-BS/NFine.Web/Resource/DbBackup/201607190929504502.bak
+++ b/WMS-BS/NFine.Web/Resource/DbBackup/201607190929504502.bak