LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/App - ±¾»ú.config
@@ -16,9 +16,21 @@ </entityFramework> <connectionStrings> <!--æ¬å°--> <add name="MyDbContext" connectionString="data source=.;initial catalog=WHMY_Prod_Test;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/> <add name="WmsDBModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/> </connectionStrings> <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> </startup> <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> </startup> <system.serviceModel> <bindings> <basicHttpBinding> <binding name="BasicHttpBinding_IPrintWcfService" /> </basicHttpBinding> </bindings> <client> <endpoint address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPrintWcfService" contract="PrintBaseService.IPrintWcfService" name="BasicHttpBinding_IPrintWcfService" /> </client> </system.serviceModel> </configuration> LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/App - Õýʽ.config
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,35 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> <configSections> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> </configSections> <entityFramework> <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework"> <parameters> <parameter value="mssqllocaldb"/> </parameters> </defaultConnectionFactory> <providers> <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/> </providers> </entityFramework> <connectionStrings> <add name="WmsDBModel" connectionString="data source=172.17.1.111;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=admin@123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/> </connectionStrings> <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> </startup> <system.serviceModel> <bindings> <basicHttpBinding> <binding name="BasicHttpBinding_IPrintWcfService" /> </basicHttpBinding> </bindings> <client> <endpoint address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPrintWcfService" contract="PrintBaseService.IPrintWcfService" name="BasicHttpBinding_IPrintWcfService" /> </client> </system.serviceModel> </configuration> LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/App.config
@@ -15,8 +15,7 @@ </providers> </entityFramework> <connectionStrings> <!--æ¬å°--> <add name="WmsDBModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/> <add name="WmsDBModel" connectionString="data source=172.17.1.111;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=admin@123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/> </connectionStrings> <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -7,6 +7,7 @@ using iWareSql; using iWareSql.DataAccess; using iWareSql.MyDbContext; using iWareSql.WmsDBModel; using System; using System.Collections.Generic; using System.Data; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/iWarePrintService.csproj
@@ -141,6 +141,7 @@ <DependentUpon>Resources.resx</DependentUpon> <DesignTime>True</DesignTime> </Compile> <None Include="App - æ£å¼.config" /> <None Include="App - æ¬æº.config" /> <None Include="Connected Services\PrintBaseService\item.xsd"> <SubType>Designer</SubType> LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/ApprovalFlow.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/ApprovalFlow.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/DingTalkUser.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/DingTalkUser.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/GoViewPro.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/GoViewPro.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/GoViewProData.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/GoViewProData.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysCodeGen.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysCodeGen.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysCodeGenConfig.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysCodeGenConfig.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysConfig.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysConfig.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysDictData.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysDictData.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysDictType.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysDictType.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysFile.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysFile.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysJobCluster.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysJobCluster.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysJobDetail.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysJobDetail.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysJobTrigger.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysJobTrigger.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysJobTriggerRecord.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysJobTriggerRecord.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLdap.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLdap.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLogDiff.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLogDiff.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLogEx.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLogEx.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLogOp.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLogOp.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysLogVis.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysLogVis.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysMenu.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysMenu.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysNotice.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysNotice.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysNoticeUser.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysNoticeUser.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysOnlineUser.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysOnlineUser.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysOpenAccess.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysOpenAccess.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysOrg.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysOrg.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysPlugin.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysPlugin.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysPos.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysPos.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysPrint.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysPrint.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysRegion.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysRegion.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysRole.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysRole.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysRoleMenu.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysRoleMenu.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysRoleOrg.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysRoleOrg.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysTenant.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysTenant.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysUser.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysUser.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysUserExtOrg.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysUserExtOrg.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysUserLdap.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysUserLdap.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysUserRole.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysUserRole.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysWechatPay.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysWechatPay.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/SysWechatUser.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/SysWechatUser.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/Test_Student.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/Test_Student.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/Test_Teachert.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/Test_Teachert.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/V_EmptyStation.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/V_EmptyStation.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/V_Station_Quan.cscopy from LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/V_EmptyStation.cs copy to LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/V_Station_Quan.cs
Îļþ´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/V_EmptyStation.cs ¸´ÖÆ @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Data.Entity.Spatial; public partial class V_EmptyStation public partial class V_Station_Quan { [Key] [Column(Order = 0)] @@ -31,7 +31,7 @@ [StringLength(50)] public string PlaceTypeName { get; set; } public decimal? Length { get; set; } public decimal? stationLength { get; set; } public decimal? Width { get; set; } @@ -86,5 +86,49 @@ [Key] [Column(Order = 7)] public bool IsDelete { get; set; } public DateTime? InTime { get; set; } [StringLength(100)] public string Upi { get; set; } [StringLength(100)] public string DetailName { get; set; } [StringLength(100)] public string PlanNo { get; set; } [StringLength(100)] public string OrderId { get; set; } [StringLength(100)] public string PackageCode { get; set; } public double? Length { get; set; } public double? Thk { get; set; } public int? StockStatus { get; set; } [StringLength(50)] public string StockStatusName { get; set; } [StringLength(255)] public string OperReason { get; set; } [StringLength(50)] public string OperUser { get; set; } public DateTime? OperTime { get; set; } public int? LockStatus { get; set; } [StringLength(255)] public string LockReason { get; set; } [StringLength(50)] public string LockUser { get; set; } public DateTime? LockTime { get; set; } } } LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/WmsDBModel.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel.cs ÐÞ¸Ä @@ -3,7 +3,7 @@ using System.Data.Entity; using System.Linq; namespace iWareSql namespace iWareSql.WmsDBModel { public partial class WmsDBModel : DbContext { @@ -88,6 +88,7 @@ public virtual DbSet<zero_interface_list> zero_interface_list { get; set; } public virtual DbSet<zero_user_info> zero_user_info { get; set; } public virtual DbSet<V_EmptyStation> V_EmptyStation { get; set; } public virtual DbSet<V_Station_Quan> V_Station_Quan { get; set; } protected override void OnModelCreating(DbModelBuilder modelBuilder) { @@ -178,6 +179,22 @@ modelBuilder.Entity<V_EmptyStation>() .Property(e => e.Thick) .HasPrecision(10, 3); modelBuilder.Entity<V_Station_Quan>() .Property(e => e.stationLength) .HasPrecision(10, 3); modelBuilder.Entity<V_Station_Quan>() .Property(e => e.Width) .HasPrecision(10, 3); modelBuilder.Entity<V_Station_Quan>() .Property(e => e.Height) .HasPrecision(10, 3); modelBuilder.Entity<V_Station_Quan>() .Property(e => e.Thick) .HasPrecision(10, 3); } } } LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_PushPackageCode.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/mes_PushPackageCode.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/mes_batchOrderUPI_new.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/mes_batchOrderUPI_new.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; @@ -11,9 +11,9 @@ [DatabaseGenerated(DatabaseGeneratedOption.None)] public long Id { get; set; } public int? AreaCode { get; set; } public int UpiStatus { get; set; } [Required] [StringLength(50)] public string UPI { get; set; } [Required] [StringLength(50)] @@ -23,9 +23,12 @@ [StringLength(50)] public string OrderId { get; set; } [Required] [StringLength(50)] public string UPI { get; set; } [StringLength(60)] public string Info5 { get; set; } public int? AreaCode { get; set; } public int UpiStatus { get; set; } [Required] [StringLength(50)] @@ -37,16 +40,7 @@ public double Thk { get; set; } [StringLength(50)] public string Matgrid { get; set; } public int? IsEB { get; set; } public int? DRNum { get; set; } public int? IsPA { get; set; } public int? MaterialIndeX { get; set; } [Required] [StringLength(50)] @@ -62,8 +56,6 @@ public int? Shelf { get; set; } public double? Rotation { get; set; } public double? Info1 { get; set; } public double? Info2 { get; set; } @@ -72,9 +64,6 @@ [StringLength(60)] public string Info4 { get; set; } [StringLength(60)] public string Info5 { get; set; } [StringLength(60)] public string Info6 { get; set; } @@ -108,6 +97,9 @@ [StringLength(60)] public string Info16 { get; set; } [StringLength(60)] public string Info17 { get; set; } public DateTime? CreateTime { get; set; } public DateTime? UpdateTime { get; set; } LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/test_place.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/test_place.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_adapter_categories.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_adapter_categories.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_adapter_management.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_adapter_management.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_adapter_record.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_adapter_record.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_area.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_area.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_factory.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_factory.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_material.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_material.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_material_type.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_material_type.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_place.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_place.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_base_warehouse.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_base_warehouse.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_no_rule.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_no_rule.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_print.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_print.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_serial_rule.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_serial_rule.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_serial_sn.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_serial_sn.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_config_sncode_rule.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_config_sncode_rule.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_log_action.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_log_action.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_rbline_runmode.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_rbline_runmode.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_rbline_task.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_rbline_task.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_record_print.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_print.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_record_trans.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_record_trans.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_stock_quan.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_stock_quan.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_sys_basic_data.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_sys_basic_data.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_sys_help_doc.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_sys_help_doc.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_sys_pda_menu.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_sys_pda_menu.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_sys_pda_role_menu.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_sys_pda_role_menu.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/wms_task.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/wms_task.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_database_info.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_database_info.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_entity_column_info.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_entity_column_info.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_entity_info.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_entity_info.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_interface_category.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_interface_category.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_interface_list.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_interface_list.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/WmsDBModel/zero_user_info.cs
ÎļþÃû´Ó LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/zero_user_info.cs ÐÞ¸Ä @@ -1,4 +1,4 @@ namespace iWareSql namespace iWareSql.WmsDBModel { using System; using System.Collections.Generic; LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareSql/iWareSql.csproj
@@ -55,14 +55,12 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> <Compile Include="ApprovalFlow.cs" /> <Compile Include="DataAccess\ContainerHandler.cs" /> <Compile Include="DataAccess\PurchaseOrderHandler.cs" /> <Compile Include="DataAccess\SapHandler.cs" /> <Compile Include="DataAccess\SysDictDataHandler.cs" /> <Compile Include="DataAccess\BasicDataSetHandler.cs" /> <Compile Include="DataAccess\ClearDataHandler.cs" /> <Compile Include="DingTalkUser.cs" /> <Compile Include="Entity\ExtendEntity\MatModel.cs" /> <Compile Include="Entity\ExtendEntity\SyncStockToMesEntity.cs" /> <Compile Include="Entity\ExtendEntity\UDT_SYS_ExceptionInfo_Extend.cs" /> @@ -79,10 +77,6 @@ <Compile Include="Entity\ViewMode\BoardLoadMaterialView.cs" /> <Compile Include="Entity\ViewMode\MatStockCollectView.cs" /> <Compile Include="Entity\ViewMode\PlaceLocationView.cs" /> <Compile Include="GoViewPro.cs" /> <Compile Include="GoViewProData.cs" /> <Compile Include="mes_batchOrderUPI_new.cs" /> <Compile Include="mes_PushPackageCode.cs" /> <Compile Include="MyDbContext\Base_BasicDataSet.cs" /> <Compile Include="MyDbContext\basic_customer_info.cs" /> <Compile Include="MyDbContext\basic_express_info.cs" /> @@ -264,78 +258,85 @@ <Compile Include="MyDbContext\ware_views_detail.cs" /> <Compile Include="MyDbContext\ware_workflow.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="SysCodeGen.cs" /> <Compile Include="SysCodeGenConfig.cs" /> <Compile Include="SysConfig.cs" /> <Compile Include="SysDictData.cs" /> <Compile Include="SysDictType.cs" /> <Compile Include="SysFile.cs" /> <Compile Include="SysJobCluster.cs" /> <Compile Include="SysJobDetail.cs" /> <Compile Include="SysJobTrigger.cs" /> <Compile Include="SysJobTriggerRecord.cs" /> <Compile Include="SysLdap.cs" /> <Compile Include="SysLogDiff.cs" /> <Compile Include="SysLogEx.cs" /> <Compile Include="SysLogOp.cs" /> <Compile Include="SysLogVis.cs" /> <Compile Include="SysMenu.cs" /> <Compile Include="SysNotice.cs" /> <Compile Include="SysNoticeUser.cs" /> <Compile Include="SysOnlineUser.cs" /> <Compile Include="SysOpenAccess.cs" /> <Compile Include="SysOrg.cs" /> <Compile Include="SysPlugin.cs" /> <Compile Include="SysPos.cs" /> <Compile Include="SysPrint.cs" /> <Compile Include="SysRegion.cs" /> <Compile Include="SysRole.cs" /> <Compile Include="SysRoleMenu.cs" /> <Compile Include="SysRoleOrg.cs" /> <Compile Include="SysTenant.cs" /> <Compile Include="SysUser.cs" /> <Compile Include="SysUserExtOrg.cs" /> <Compile Include="SysUserLdap.cs" /> <Compile Include="SysUserRole.cs" /> <Compile Include="SysWechatPay.cs" /> <Compile Include="SysWechatUser.cs" /> <Compile Include="TestMyDbContext\Model1.cs" /> <Compile Include="test_place.cs" /> <Compile Include="Test_Student.cs" /> <Compile Include="Test_Teachert.cs" /> <Compile Include="V_EmptyStation.cs" /> <Compile Include="WmsDBModel.cs" /> <Compile Include="wms_adapter_categories.cs" /> <Compile Include="wms_adapter_management.cs" /> <Compile Include="wms_adapter_record.cs" /> <Compile Include="wms_base_area.cs" /> <Compile Include="wms_base_factory.cs" /> <Compile Include="wms_base_material.cs" /> <Compile Include="wms_base_material_type.cs" /> <Compile Include="wms_base_place.cs" /> <Compile Include="wms_base_warehouse.cs" /> <Compile Include="wms_config_no_rule.cs" /> <Compile Include="wms_config_print.cs" /> <Compile Include="wms_config_serial_rule.cs" /> <Compile Include="wms_config_serial_sn.cs" /> <Compile Include="wms_config_sncode_rule.cs" /> <Compile Include="wms_log_action.cs" /> <Compile Include="wms_rbline_runmode.cs" /> <Compile Include="wms_rbline_task.cs" /> <Compile Include="wms_record_print.cs" /> <Compile Include="wms_record_trans.cs" /> <Compile Include="wms_stock_quan.cs" /> <Compile Include="wms_sys_basic_data.cs" /> <Compile Include="wms_sys_help_doc.cs" /> <Compile Include="wms_sys_pda_menu.cs" /> <Compile Include="wms_sys_pda_role_menu.cs" /> <Compile Include="wms_task.cs" /> <Compile Include="zero_database_info.cs" /> <Compile Include="zero_entity_column_info.cs" /> <Compile Include="zero_entity_info.cs" /> <Compile Include="zero_interface_category.cs" /> <Compile Include="zero_interface_list.cs" /> <Compile Include="zero_user_info.cs" /> <Compile Include="WmsDBModel\ApprovalFlow.cs" /> <Compile Include="WmsDBModel\DingTalkUser.cs" /> <Compile Include="WmsDBModel\GoViewPro.cs" /> <Compile Include="WmsDBModel\GoViewProData.cs" /> <Compile Include="WmsDBModel\mes_batchOrderUPI_new.cs" /> <Compile Include="WmsDBModel\mes_PushPackageCode.cs" /> <Compile Include="WmsDBModel\SysCodeGen.cs" /> <Compile Include="WmsDBModel\SysCodeGenConfig.cs" /> <Compile Include="WmsDBModel\SysConfig.cs" /> <Compile Include="WmsDBModel\SysDictData.cs" /> <Compile Include="WmsDBModel\SysDictType.cs" /> <Compile Include="WmsDBModel\SysFile.cs" /> <Compile Include="WmsDBModel\SysJobCluster.cs" /> <Compile Include="WmsDBModel\SysJobDetail.cs" /> <Compile Include="WmsDBModel\SysJobTrigger.cs" /> <Compile Include="WmsDBModel\SysJobTriggerRecord.cs" /> <Compile Include="WmsDBModel\SysLdap.cs" /> <Compile Include="WmsDBModel\SysLogDiff.cs" /> <Compile Include="WmsDBModel\SysLogEx.cs" /> <Compile Include="WmsDBModel\SysLogOp.cs" /> <Compile Include="WmsDBModel\SysLogVis.cs" /> <Compile Include="WmsDBModel\SysMenu.cs" /> <Compile Include="WmsDBModel\SysNotice.cs" /> <Compile Include="WmsDBModel\SysNoticeUser.cs" /> <Compile Include="WmsDBModel\SysOnlineUser.cs" /> <Compile Include="WmsDBModel\SysOpenAccess.cs" /> <Compile Include="WmsDBModel\SysOrg.cs" /> <Compile Include="WmsDBModel\SysPlugin.cs" /> <Compile Include="WmsDBModel\SysPos.cs" /> <Compile Include="WmsDBModel\SysPrint.cs" /> <Compile Include="WmsDBModel\SysRegion.cs" /> <Compile Include="WmsDBModel\SysRole.cs" /> <Compile Include="WmsDBModel\SysRoleMenu.cs" /> <Compile Include="WmsDBModel\SysRoleOrg.cs" /> <Compile Include="WmsDBModel\SysTenant.cs" /> <Compile Include="WmsDBModel\SysUser.cs" /> <Compile Include="WmsDBModel\SysUserExtOrg.cs" /> <Compile Include="WmsDBModel\SysUserLdap.cs" /> <Compile Include="WmsDBModel\SysUserRole.cs" /> <Compile Include="WmsDBModel\SysWechatPay.cs" /> <Compile Include="WmsDBModel\SysWechatUser.cs" /> <Compile Include="WmsDBModel\test_place.cs" /> <Compile Include="WmsDBModel\Test_Student.cs" /> <Compile Include="WmsDBModel\Test_Teachert.cs" /> <Compile Include="WmsDBModel\V_EmptyStation.cs" /> <Compile Include="WmsDBModel\V_Station_Quan.cs" /> <Compile Include="WmsDBModel\WmsDBModel.cs" /> <Compile Include="WmsDBModel\wms_adapter_categories.cs" /> <Compile Include="WmsDBModel\wms_adapter_management.cs" /> <Compile Include="WmsDBModel\wms_adapter_record.cs" /> <Compile Include="WmsDBModel\wms_base_area.cs" /> <Compile Include="WmsDBModel\wms_base_factory.cs" /> <Compile Include="WmsDBModel\wms_base_material.cs" /> <Compile Include="WmsDBModel\wms_base_material_type.cs" /> <Compile Include="WmsDBModel\wms_base_place.cs" /> <Compile Include="WmsDBModel\wms_base_warehouse.cs" /> <Compile Include="WmsDBModel\wms_config_no_rule.cs" /> <Compile Include="WmsDBModel\wms_config_print.cs" /> <Compile Include="WmsDBModel\wms_config_serial_rule.cs" /> <Compile Include="WmsDBModel\wms_config_serial_sn.cs" /> <Compile Include="WmsDBModel\wms_config_sncode_rule.cs" /> <Compile Include="WmsDBModel\wms_log_action.cs" /> <Compile Include="WmsDBModel\wms_rbline_runmode.cs" /> <Compile Include="WmsDBModel\wms_rbline_task.cs" /> <Compile Include="WmsDBModel\wms_record_print.cs" /> <Compile Include="WmsDBModel\wms_record_trans.cs" /> <Compile Include="WmsDBModel\wms_stock_quan.cs" /> <Compile Include="WmsDBModel\wms_sys_basic_data.cs" /> <Compile Include="WmsDBModel\wms_sys_help_doc.cs" /> <Compile Include="WmsDBModel\wms_sys_pda_menu.cs" /> <Compile Include="WmsDBModel\wms_sys_pda_role_menu.cs" /> <Compile Include="WmsDBModel\wms_task.cs" /> <Compile Include="WmsDBModel\zero_database_info.cs" /> <Compile Include="WmsDBModel\zero_entity_column_info.cs" /> <Compile Include="WmsDBModel\zero_entity_info.cs" /> <Compile Include="WmsDBModel\zero_interface_category.cs" /> <Compile Include="WmsDBModel\zero_interface_list.cs" /> <Compile Include="WmsDBModel\zero_user_info.cs" /> </ItemGroup> <ItemGroup> <None Include="App.config"> LA24030_LuLiPackageLine_Print/´òÓ¡Ä£°åÎļþ/°ü×°ÌõÂëÄ£°å_¶þάÂë.btwBinary files differ
LA24030_LuLiPackageLine_Web/public/config.js
@@ -5,4 +5,5 @@ "VITE_PUBLIC_PATH": "", "VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312", "VITE_API_URL": "http://localhost:5005" //"VITE_API_URL": "http://172.17.1.111:5005" //æ£å¼å°å } LA24030_LuLiPackageLine_Web/src/api/main/ThirdInterFace/mesPushPackageCode.ts
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ import request from '/@/utils/request'; enum Api { AddMesPushPackageCode = '/api/mesPushPackageCode/add', DeleteMesPushPackageCode = '/api/mesPushPackageCode/delete', UpdateMesPushPackageCode = '/api/mesPushPackageCode/update', PageMesPushPackageCode = '/api/mesPushPackageCode/page', ListMesPushPackageCode = '/api/mesPushPackageCode/list', DetailMesPushPackageCode = '/api/mesPushPackageCode/detail', ImportExcelMesPushPackageCode = '/api/mesPushPackageCode/importExcel', DownloadExcelTemplateMesPushPackageCode = '/api/mesPushPackageCode/downloadExcelTemplate', } // å¢å å è£ å®æå¯¹æ¥ export const addMesPushPackageCode = (params?: any) => request({ url: Api.AddMesPushPackageCode, method: 'post', data: params }); // å é¤å è£ å®æå¯¹æ¥ export const deleteMesPushPackageCode = (params?: any) => request({ url: Api.DeleteMesPushPackageCode, method: 'post', data: params }); // ç¼è¾å è£ å®æå¯¹æ¥ export const updateMesPushPackageCode = (params?: any) => request({ url: Api.UpdateMesPushPackageCode, method: 'post', data: params }); // å¯¼å ¥å è£ å®æå¯¹æ¥ export const importExcelMesPushPackageCode = (params?: any) => request({ url: Api.ImportExcelMesPushPackageCode, method: 'post', data: params }); // ä¸è½½å¯¼å ¥å è£ å®æå¯¹æ¥æ¨¡æ¿ export const downloadExcelTemplateMesPushPackageCode = (params?: any) => request({ url: Api.DownloadExcelTemplateMesPushPackageCode, method: 'get', data: params, responseType: 'blob' }); // å页æ¥è¯¢å è£ å®æå¯¹æ¥ export const pageMesPushPackageCode = (params?: any) => request({ url: Api.PageMesPushPackageCode, method: 'post', data: params }); // ä¸å页æ¥è¯¢å è£ å®æå¯¹æ¥ export const listMesPushPackageCode = (params?: any) => request({ url: Api.ListMesPushPackageCode, method: 'get', data: params }); // 详æ å è£ å®æå¯¹æ¥ export const detailMesPushPackageCode = (id: any) => request({ url: Api.DetailMesPushPackageCode, method: 'get', data: { id } }); LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,187 @@ <template> <div class="mesPushPackageCode-container"> <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false"> <template #header> <div style="color: #fff"> <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>--> <span>{{ props.title }}</span> </div> </template> <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading"> <el-row :gutter="35"> <el-form-item v-show="false"> <el-input v-model="ruleForm.id" /> </el-form-item> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="å è£ å·" prop="packageCode"> <el-input v-model="ruleForm.packageCode" placeholder="请è¾å ¥å è£ å·" maxlength="50" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æ¨éç¶æ" prop="pushStatus"> <el-select clearable v-model="ruleForm.pushStatus" placeholder="è¯·éæ©æ¨éç¶æ"> <el-option v-for="(item,index) in getEnumPushStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option> </el-select> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æ¨éæ¶é´" prop="pushTime"> <el-date-picker v-model="ruleForm.pushTime" type="date" placeholder="æ¨éæ¶é´" /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æ¨é次æ°" prop="pushNum"> <el-input-number v-model="ruleForm.pushNum" placeholder="请è¾å ¥æ¨é次æ°" clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="æ¥å£è¿ååæ°" prop="apiMessage"> <el-input v-model="ruleForm.apiMessage" placeholder="请è¾å ¥æ¥å£è¿ååæ°" maxlength="50" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="å建è é¨é¨åç§°" prop="createOrgName"> <el-input v-model="ruleForm.createOrgName" placeholder="请è¾å ¥å建è é¨é¨åç§°" maxlength="64" show-word-limit clearable /> </el-form-item> </el-col> </el-row> </el-form> <template #footer> <span class="dialog-footer"> <el-button @click="cancel">å æ¶</el-button> <el-button type="primary" @click="submit" :disabled="disabled_btn">ç¡® å®</el-button> </span> </template> </el-dialog> </div> </template> <style scoped> :deep(.el-select), :deep(.el-input-number) { width: 100%; } </style> <script lang="ts" setup> import { ref,onMounted } from "vue"; import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils'; import { ElMessage } from "element-plus"; import type { FormRules } from "element-plus"; import { addMesPushPackageCode, updateMesPushPackageCode, detailMesPushPackageCode } from "/@/api/main/ThirdInterFace/mesPushPackageCode"; import { getAPI } from '/@/utils/axios-utils'; import { SysEnumApi } from '/@/api-services/api'; const getEnumPushStatusData = ref<any>([]); //ç¶çº§ä¼ 鿥çåæ° var props = defineProps({ title: { type: String, default: "", }, }); //ç¶çº§ä¼ 鿥ç彿°ï¼ç¨äºåè° const emit = defineEmits(["reloadTable"]); const ruleFormRef = ref(); const isShowDialog = ref(false); const loading = ref(false); const disabled_btn = ref(false); const ruleForm = ref<any>({}); //èªè¡æ·»å å ¶ä»è§å const rules = ref<FormRules>({ packageCode: [{required: true, message: '请è¾å ¥å è£ å·ï¼', trigger: 'blur',},], pushStatus: [{required: true, message: 'è¯·éæ©æ¨éç¶æï¼', trigger: 'change',},], pushNum: [{required: true, message: '请è¾å ¥æ¨é次æ°ï¼', trigger: 'blur',},], apiMessage: [{required: true, message: '请è¾å ¥æ¥å£è¿ååæ°ï¼', trigger: 'blur',},], createOrgName: [{required: true, message: '请è¾å ¥å建è é¨é¨åç§°ï¼', trigger: 'blur',},], isDelete: [{required: true, message: 'è¯·éæ©è½¯å é¤ï¼', trigger: 'change',},], }); /* * æå¼å¼¹çª * @param flag æ è®°ï¼1æ°å¢ 2ç¼è¾ 3æ¥çï¼ * @param row è¡æ°æ® */ const openDialog = async (flag: number,row: any) => { // ruleForm.value = JSON.parse(JSON.stringify(row)); // æ¹ç¨detailè·åææ°æ°æ®æ¥ç¼è¾ let rowData = JSON.parse(JSON.stringify(row)); if (rowData.id) ruleForm.value = (await detailMesPushPackageCode(rowData.id)).data.result; else { ruleForm.value = rowData; } isShowDialog.value = true; }; // å ³éå¼¹çª const closeDialog = () => { emit("reloadTable"); isShowDialog.value = false; }; // åæ¶ const cancel = () => { isShowDialog.value = false; }; // æäº¤ const submit = async () => { disabled_btn.value = true; ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => { if (isValid) { loading.value = true; let values = ruleForm.value; let ret={}; let title='æ°å¢'; if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) { ret = await addMesPushPackageCode(values); } else { title='ç¼è¾'; ret = await updateMesPushPackageCode(values); } loading.value = false; disabled_btn.value = false; if(ret.data.type=="success"){ ElMessage.success(title+'æå'); closeDialog(); } } else { disabled_btn.value = false; ElMessage({ message: `表åæ${Object.keys(fields).length}å¤éªè¯å¤±è´¥ï¼è¯·ä¿®æ¹ååæäº¤`, type: "error", }); } }); }; // 页é¢å è½½æ¶ onMounted(async () => { getEnumPushStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PushStatusEnum')).data.result ?? []; }); //å°å±æ§æè 彿°æ´é²ç»ç¶ç»ä»¶ defineExpose({ openDialog }); </script> LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,280 @@ <template> <div class="mesPushPackageCode-container"> <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> <el-form :model="queryParamsMesPushPackageCode" ref="queryForm" labelWidth="90"> <el-row> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10"> <el-form-item label="å ³é®å"> <el-input v-model="queryParamsMesPushPackageCode.searchKey" clearable="" placeholder="å è£ å·,æ¥å£è¿ååæ°,å建è é¨é¨åç§°,å建人,ä¿®æ¹äºº"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode"> <el-form-item label="å è£ å·"> <el-input v-model="queryParamsMesPushPackageCode.packageCode" clearable="" placeholder="请è¾å ¥å è£ å·"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode"> <el-form-item label="æ¨éç¶æ"> <el-select clearable="" v-model="queryParamsMesPushPackageCode.pushStatus" placeholder="è¯·éæ©æ¨éç¶æ"> <el-option v-for="(item,index) in getEnumPushStatusData_Index" :key="index" :value="item.value" :label="`${item.describe}`" /> </el-select> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode"> <el-form-item label="æ¨éæ¶é´"> <el-date-picker placeholder="è¯·éæ©æ¨éæ¶é´" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPackageCode.pushTimeRange" /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode"> <el-form-item label="æ¨é次æ°"> <el-input-number v-model="queryParamsMesPushPackageCode.pushNum" clearable="" placeholder="请è¾å ¥æ¨é次æ°"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode"> <el-form-item label="æ¥å£è¿ååæ°"> <el-input v-model="queryParamsMesPushPackageCode.apiMessage" clearable="" placeholder="请è¾å ¥æ¥å£è¿ååæ°"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode"> <el-form-item label="å建è é¨é¨åç§°"> <el-input v-model="queryParamsMesPushPackageCode.createOrgName" clearable="" placeholder="请è¾å ¥å建è é¨é¨åç§°"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10"> <el-form-item> <el-button-group style="display: flex; align-items: center;"> <el-button type="primary" icon="ele-Search" @click="handleQueryMesPushPackageCode" v-auth="'mesPushPackageCode:page'" :disabled="disabled_btnMesPushPackageCode"> æ¥è¯¢ </el-button> <el-button icon="ele-Refresh" @click="resetMesPushPackageCode"> éç½® </el-button> <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIMesPushPackageCode" v-if="!showAdvanceQueryUIMesPushPackageCode" style="margin-left:5px;"> é«çº§æ¥è¯¢ </el-button> <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIMesPushPackageCode" v-if="showAdvanceQueryUIMesPushPackageCode" style="margin-left:5px;"> éè </el-button> <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddMesPushPackageCode" v-auth="'mesPushPackageCode:add'"> æ°å¢ </el-button> <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelMesPushPackageCode" v-auth="'mesPushPackageCode:exportExcel'" > å¯¼åº </el-button> </el-button-group> </el-form-item> </el-col> </el-row> </el-form> </el-card> <el-card class="full-table" shadow="hover" style="margin-top: 5px"> <el-table ref="tableRefMesPushPackageCode" :data="tableDataMesPushPackageCode" style="width: 100%" v-loading="loadingMesPushPackageCode" tooltip-effect="light" row-key="id" @sort-change="sortChangeMesPushPackageCode" border=""> <el-table-column type="index" label="åºå·" width="55" align="center"/> <el-table-column prop="packageCode" label="å è£ å·" show-overflow-tooltip="" /> <el-table-column prop="pushStatus" label="æ¨éç¶æ" show-overflow-tooltip="" > <template #default="scope"> <el-tag>{{ getEnumDesc(scope.row.pushStatus, getEnumPushStatusData_Index)}}</el-tag> </template> </el-table-column> <el-table-column prop="pushTime" label="æ¨éæ¶é´" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" /> <el-table-column prop="pushNum" label="æ¨é次æ°" show-overflow-tooltip="" /> <el-table-column prop="apiMessage" label="æ¥å£è¿ååæ°" show-overflow-tooltip="" /> <el-table-column prop="createOrgName" label="å建è é¨é¨åç§°" show-overflow-tooltip="" /> <el-table-column prop="createTime" label="å建æ¶é´" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> <el-table-column prop="updateTime" label="ä¿®æ¹æ¶é´" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> <el-table-column prop="createUserName" label="å建人" show-overflow-tooltip="" /> <el-table-column prop="updateUserName" label="ä¿®æ¹äºº" show-overflow-tooltip="" /> <el-table-column label="æä½" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mesPushPackageCode:update') || auth('mesPushPackageCode:delete')"> <template #default="scope"> <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMesPushPackageCode(scope.row)" v-auth="'mesPushPackageCode:update'"> ç¼è¾ </el-button> <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delMesPushPackageCode(scope.row)" v-auth="'mesPushPackageCode:delete'"> å é¤ </el-button> </template> </el-table-column> </el-table> <el-pagination v-model:currentPage="tableParamsMesPushPackageCode.page" v-model:page-size="tableParamsMesPushPackageCode.pageSize" :total="tableParamsMesPushPackageCode.total" :page-sizes="[10, 20, 50, 100, 200, 500]" small="" background="" @size-change="handleSizeChangeMesPushPackageCode" @current-change="handleCurrentChangeMesPushPackageCode" layout="total, sizes, prev, pager, next, jumper" /> <printDialogMesPushPackageCode ref="printDialogRefMesPushPackageCode" :title="printMesPushPackageCodeTitle" @reloadTable="handleQueryMesPushPackageCode" /> <editDialogMesPushPackageCode ref="editDialogRefMesPushPackageCode" :title="editMesPushPackageCodeTitle" @reloadTable="handleQueryMesPushPackageCode" /> </el-card> </div> </template> <script lang="ts" setup="" name="mesPushPackageCode"> import { ref,onMounted } from "vue"; import { ElMessageBox, ElMessage } from "element-plus"; import { auth } from '/@/utils/authFunction'; import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils'; import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime'; import { exportPageExcel } from '/@/utils/exportPageExcel' //å¼å ¥å¯¼åºæ¹æ³ import printDialogMesPushPackageCode from '/@/views/system/print/component/hiprint/preview.vue' import editDialogMesPushPackageCode from '/@/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue' import { pageMesPushPackageCode, deleteMesPushPackageCode,importExcelMesPushPackageCode,downloadExcelTemplateMesPushPackageCode } from '/@/api/main/ThirdInterFace/mesPushPackageCode'; import { getAPI } from '/@/utils/axios-utils'; import { SysEnumApi } from '/@/api-services/api'; import commonFunction from '/@/utils/commonFunction'; const getEnumPushStatusData_Index = ref<any>([]); const { getEnumDesc } = commonFunction(); /***************************************************[å è£ å®æå¯¹æ¥æä½]å¼å§***************************************************/ const showAdvanceQueryUIMesPushPackageCode = ref(false); const tableRefMesPushPackageCode = ref(null); const printDialogRefMesPushPackageCode = ref(); const editDialogRefMesPushPackageCode = ref(); const loadingMesPushPackageCode = ref(false); const disabled_btnMesPushPackageCode = ref(false); const tableDataMesPushPackageCode = ref<any>([]); const queryParamsMesPushPackageCode = ref<any>({}); const tableParamsMesPushPackageCode = ref({ page: 1, pageSize: 10, total: 0, }); const printMesPushPackageCodeTitle = ref(""); const editMesPushPackageCodeTitle = ref(""); // æ¹åé«çº§æ¥è¯¢çæ§ä»¶æ¾ç¤ºç¶æ const changeAdvanceQueryUIMesPushPackageCode = () => { showAdvanceQueryUIMesPushPackageCode.value = !showAdvanceQueryUIMesPushPackageCode.value; } // æ¥è¯¢å è£ å®æå¯¹æ¥ const handleQueryMesPushPackageCode = async () => { loadingMesPushPackageCode.value = true; disabled_btnMesPushPackageCode.value = true; var res = await pageMesPushPackageCode(Object.assign(queryParamsMesPushPackageCode.value, tableParamsMesPushPackageCode.value)); if(res.data.type=="success"){ tableDataMesPushPackageCode.value = res.data.result?.items ?? []; tableParamsMesPushPackageCode.value.total = res.data.result?.total; } loadingMesPushPackageCode.value = false; disabled_btnMesPushPackageCode.value = false; }; // éç½®å è£ å®æå¯¹æ¥æ¥è¯¢ const resetMesPushPackageCode = async () => { queryParamsMesPushPackageCode.value = {} }; // å è£ å®æå¯¹æ¥åæåº const sortChangeMesPushPackageCode = async (column: any) => { queryParamsMesPushPackageCode.value.field = column.prop; queryParamsMesPushPackageCode.value.order = column.order; await handleQueryMesPushPackageCode(); }; // æå¼æ°å¢å è£ å®æå¯¹æ¥é¡µé¢ const openAddMesPushPackageCode = () => { editMesPushPackageCodeTitle.value = 'æ·»å å è£ å®æå¯¹æ¥'; editDialogRefMesPushPackageCode.value.openDialog(1,{}); }; // æå¼æå°å è£ å®æå¯¹æ¥é¡µé¢ const openPrintMesPushPackageCode = async (row: any) => { printMesPushPackageCodeTitle.value = 'æå°å è£ å®æå¯¹æ¥'; } // æå¼ç¼è¾å è£ å®æå¯¹æ¥é¡µé¢ const openEditMesPushPackageCode = (row: any) => { editMesPushPackageCodeTitle.value = 'ç¼è¾å è£ å®æå¯¹æ¥'; editDialogRefMesPushPackageCode.value.openDialog(2,row); }; // å é¤å è£ å®æå¯¹æ¥ const delMesPushPackageCode = (row: any) => { ElMessageBox.confirm(`ç¡®å®è¦å é¤å?`, "æç¤º", { confirmButtonText: "ç¡®å®", cancelButtonText: "åæ¶", type: "warning", }) .then(async () => { loadingMesPushPackageCode.value = true; var ret = await deleteMesPushPackageCode(row); if(ret.data.type=="success"){ ElMessage.success("å 餿å"); } loadingMesPushPackageCode.value = false; handleQueryMesPushPackageCode(); }) .catch(() => {}); }; // æ¹åå è£ å®æå¯¹æ¥é¡µé¢å®¹é const handleSizeChangeMesPushPackageCode = (val: number) => { tableParamsMesPushPackageCode.value.pageSize = val; handleQueryMesPushPackageCode(); }; // æ¹åå è£ å®æå¯¹æ¥é¡µç åºå· const handleCurrentChangeMesPushPackageCode = (val: number) => { tableParamsMesPushPackageCode.value.page = val; handleQueryMesPushPackageCode(); }; /***************************************************[å è£ å®æå¯¹æ¥æä½]ç»æ***************************************************/ /***************************************************[å è£ å®æå¯¹æ¥å¯¼åº]å¼å§***************************************************/ //å®ä¹å½å页é¢çæ¹æ³ç» const functionMapMesPushPackageCode = { getEnumPushStatusData_Index, formatDate_T_Date, formatDate_T_Time }; //ç¹å»å¯¼åºæé® const handleExportExcelMesPushPackageCode = async (formData:Blob) => { loadingMesPushPackageCode.value = true; disabled_btnMesPushPackageCode.value = true; var new_tableParamsMesPushPackageCode=JSON.parse(JSON.stringify(tableParamsMesPushPackageCode.value)); new_tableParamsMesPushPackageCode.page = 1; new_tableParamsMesPushPackageCode.pageSize = 100000; var res = await pageMesPushPackageCode(Object.assign(queryParamsMesPushPackageCode.value, new_tableParamsMesPushPackageCode)); if(res.data.type=="success"){ exportExcelMesPushPackageCode(res.data.result?.items ?? []); } loadingMesPushPackageCode.value = false; disabled_btnMesPushPackageCode.value = false; }; //å¯¼åº const exportExcelMesPushPackageCode = async (exportDataList:Array) => { exportPageExcel(exportDataList, tableRefMesPushPackageCode,"å è£ å®æå¯¹æ¥",functionMapMesPushPackageCode); }; /***************************************************[å è£ å®æå¯¹æ¥å¯¼åº]ç»æ***************************************************/ // å è£ å®æå¯¹æ¥é¡µé¢å è½½æ¶ onMounted(async () => { getEnumPushStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PushStatusEnum')).data.result ?? []; }); handleQueryMesPushPackageCode(); </script> <style scoped> :deep(.el-input), :deep(.el-select), :deep(.el-input-number) { width: 100%; } </style> LA24030_LuLiPackageLine_Web/stats.html
ÎļþÌ«´ó LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
@@ -9,7 +9,7 @@ //"ConfigId": "1300000000001", // é»è®¤åºæ è¯-ç¦æ¢ä¿®æ¹ "DbType": "SqlServer", // MySqlãSqlServerãSqliteãOracleãPostgreSQLãDmãKdbndpãOscarãMySqlConnectorãAccessãOpenGaussãQuestDBãHGãClickHouseãGBaseãOdbcãCustom // "ConnectionString": "Server=.;Database=iWare_RawMaterialWarehouse_Wms;User=sa;Password=123456;MultipleActiveResultSets=True;", // åºè¿æ¥å符串 "ConnectionString": "Server=.;Database=LA24030_LuLiPackageLine;User=sa;Password=123abc.com;MultipleActiveResultSets=True;", // åºè¿æ¥å符串 "ConnectionString": "Server=172.17.1.111;Database=LA24030_LuLiPackageLine;User=sa;Password=admin@123;MultipleActiveResultSets=True;", // åºè¿æ¥å符串 //"SlaveConnectionConfigs": [ // 读åå离/ä¸»ä» // { // "HitRate": 10, @@ -22,7 +22,7 @@ //], "DbSettings": { "EnableInitDb": true, // å¯ç¨åºåå§å "EnableDiffLog": true, // å¯ç¨åºè¡¨å·®å¼æ¥å¿ "EnableDiffLog": false, // å¯ç¨åºè¡¨å·®å¼æ¥å¿ "EnableUnderLine": false // å¯ç¨é©¼å³°è½¬ä¸å线 }, "TableSettings": { @@ -30,7 +30,7 @@ "EnableIncreTable": false // å¯ç¨è¡¨å¢éæ´æ°-ç¹æ§[IncreTable] }, "SeedSettings": { "EnableInitSeed": false, // å¯ç¨ç§ååå§å "EnableInitSeed": true, // å¯ç¨ç§ååå§å "EnableIncreSeed": false // å¯ç¨ç§åå¢éæ´æ°-ç¹æ§[IncreSeed] } } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
@@ -1,10 +1,12 @@ using Admin.NET.Core; using Admin.NET.Core.Enum; namespace Admin.NET.Application.Entity; /// <summary> /// æ¨émeså è£ å·è¡¨ /// </summary> [SugarTable("mes_PushPackageCode", "æ¨émeså è£ å·è¡¨")] [SugarTable("mes_push_packagecode", "æ¨émeså è£ å·è¡¨")] public class MesPushPackageCode : EntityBase { /// <summary> @@ -19,7 +21,14 @@ /// </summary> [Required] [SugarColumn(ColumnName = "PushStatus", ColumnDescription = "æ¨éç¶æ")] public int PushStatus { get; set; } public PushStatusEnum PushStatus { get; set; } /// <summary> /// æ¨éæ¶é´ /// </summary> [SugarColumn(ColumnName = "PushTime", ColumnDescription = "æ¨éæ¶é´")] public DateTime? PushTime { get; set; } /// <summary> /// æ¨éæ¬¡æ° LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,60 @@ using Admin.NET.Core; using Admin.NET.Core.Enum; namespace Admin.NET.Application.Entity; /// <summary> /// æ¨émesè£çº¸æºæ¥å£ /// </summary> [SugarTable("mes_push_papercut", "æ¨émesè£çº¸æºæ¥å£")] public class MesPushPaperCut : EntityBase { #region æ¨éåæ° /// <summary> /// å è£ å· /// </summary> [Required] [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "å è£ å·", Length = 50)] public string PackageCode { get; set; } [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱é¿", Length = 50)] public float? Info1 { get; set; } [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)] public float? Info2 { get; set; } [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱é«", Length = 50)] public float? Info3 { get; set; } #endregion /// <summary> /// æ¨éç¶æ /// </summary> [Required] [SugarColumn(ColumnName = "PushStatus", ColumnDescription = "æ¨éç¶æ")] public PushStatusEnum PushStatus { get; set; } /// <summary> /// æ¨éæ¶é´ /// </summary> [SugarColumn(ColumnName = "PushTime", ColumnDescription = "æ¨éæ¶é´")] public DateTime? PushTime { get; set; } /// <summary> /// æ¨éæ¬¡æ° /// </summary> [Required] [SugarColumn(ColumnName = "PushNum", ColumnDescription = "æ¨é次æ°")] public int PushNum { get; set; } /// <summary> /// æ¥å£è¿ååæ° /// </summary> [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "æ¥å£è¿ååæ°", Length = 50)] public string ApiMessage { get; set; } } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PushStatusEnum.cs
@@ -5,6 +5,12 @@ using System.Threading.Tasks; namespace Admin.NET.Core.Enum; /// <summary> /// æ¨éç¶æ /// </summary> [Description("æ¨éç¶æ")] public enum PushStatusEnum { /// <summary> LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,198 @@ using Admin.NET.Core; using System.ComponentModel.DataAnnotations; namespace Admin.NET.Application; /// <summary> /// å è£ å®æå¯¹æ¥åºç¡è¾å ¥åæ° /// </summary> public class MesPushPackageCodeBaseInput { /// <summary> /// å è£ å· /// </summary> public virtual string PackageCode { get; set; } /// <summary> /// æ¨éç¶æ /// </summary> public virtual Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; } /// <summary> /// æ¨éæ¶é´ /// </summary> public virtual DateTime? PushTime { get; set; } /// <summary> /// æ¨éæ¬¡æ° /// </summary> public virtual int PushNum { get; set; } /// <summary> /// æ¥å£è¿ååæ° /// </summary> public virtual string ApiMessage { get; set; } /// <summary> /// å建è é¨é¨Id /// </summary> public virtual long? CreateOrgId { get; set; } /// <summary> /// å建è é¨é¨åç§° /// </summary> public virtual string CreateOrgName { get; set; } /// <summary> /// å建æ¶é´ /// </summary> public virtual DateTime? CreateTime { get; set; } /// <summary> /// ä¿®æ¹æ¶é´ /// </summary> public virtual DateTime? UpdateTime { get; set; } /// <summary> /// å建人Id /// </summary> public virtual long? CreateUserId { get; set; } /// <summary> /// å建人 /// </summary> public virtual string CreateUserName { get; set; } /// <summary> /// ä¿®æ¹äººId /// </summary> public virtual long? UpdateUserId { get; set; } /// <summary> /// ä¿®æ¹äºº /// </summary> public virtual string UpdateUserName { get; set; } /// <summary> /// 软å é¤ /// </summary> public virtual bool IsDelete { get; set; } } /// <summary> /// å è£ å®æå¯¹æ¥å页æ¥è¯¢è¾å ¥åæ° /// </summary> public class MesPushPackageCodeInput : BasePageInput { /// <summary> /// å ³é®åæ¥è¯¢ /// </summary> public string? SearchKey { get; set; } /// <summary> /// å è£ å· /// </summary> public string? PackageCode { get; set; } /// <summary> /// æ¨éç¶æ /// </summary> public Admin.NET.Core.Enum.PushStatusEnum? PushStatus { get; set; } /// <summary> /// æ¨éæ¶é´ /// </summary> public DateTime? PushTime { get; set; } /// <summary> /// æ¨éæ¶é´èå´ /// </summary> public List<DateTime?> PushTimeRange { get; set; } /// <summary> /// æ¨éæ¬¡æ° /// </summary> public int? PushNum { get; set; } /// <summary> /// æ¥å£è¿ååæ° /// </summary> public string? ApiMessage { get; set; } /// <summary> /// å建è é¨é¨åç§° /// </summary> public string? CreateOrgName { get; set; } } /// <summary> /// å è£ å®æå¯¹æ¥å¢å è¾å ¥åæ° /// </summary> public class AddMesPushPackageCodeInput : MesPushPackageCodeBaseInput { /// <summary> /// å è£ å· /// </summary> [Required(ErrorMessage = "å è£ å·ä¸è½ä¸ºç©º")] public override string PackageCode { get; set; } /// <summary> /// æ¨éç¶æ /// </summary> [Required(ErrorMessage = "æ¨éç¶æä¸è½ä¸ºç©º")] public override Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; } /// <summary> /// æ¨éæ¬¡æ° /// </summary> [Required(ErrorMessage = "æ¨é次æ°ä¸è½ä¸ºç©º")] public override int PushNum { get; set; } /// <summary> /// æ¥å£è¿ååæ° /// </summary> [Required(ErrorMessage = "æ¥å£è¿ååæ°ä¸è½ä¸ºç©º")] public override string ApiMessage { get; set; } /// <summary> /// å建è é¨é¨åç§° /// </summary> [Required(ErrorMessage = "å建è é¨é¨åç§°ä¸è½ä¸ºç©º")] public override string CreateOrgName { get; set; } /// <summary> /// 软å é¤ /// </summary> [Required(ErrorMessage = "软å é¤ä¸è½ä¸ºç©º")] public override bool IsDelete { get; set; } } /// <summary> /// å è£ å®æå¯¹æ¥å é¤è¾å ¥åæ° /// </summary> public class DeleteMesPushPackageCodeInput : BaseIdInput { } /// <summary> /// å è£ å®æå¯¹æ¥æ´æ°è¾å ¥åæ° /// </summary> public class UpdateMesPushPackageCodeInput : AddMesPushPackageCodeInput { /// <summary> /// 主é®Id /// </summary> [Required(ErrorMessage = "主é®Idä¸è½ä¸ºç©º")] public long Id { get; set; } } /// <summary> /// å è£ å®æå¯¹æ¥ä¸»é®æ¥è¯¢è¾å ¥åæ° /// </summary> public class QueryByIdMesPushPackageCodeInput : DeleteMesPushPackageCodeInput { } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,85 @@ namespace Admin.NET.Application; /// <summary> /// å è£ å®æå¯¹æ¥è¾åºåæ° /// </summary> public class MesPushPackageCodeOutput { /// <summary> /// 主é®Id /// </summary> public long? Id { get; set; } /// <summary> /// å è£ å· /// </summary> public string PackageCode { get; set; } /// <summary> /// æ¨éç¶æ /// </summary> public Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; } /// <summary> /// æ¨éæ¶é´ /// </summary> public DateTime? PushTime { get; set; } /// <summary> /// æ¨éæ¬¡æ° /// </summary> public int PushNum { get; set; } /// <summary> /// æ¥å£è¿ååæ° /// </summary> public string ApiMessage { get; set; } /// <summary> /// å建è é¨é¨Id /// </summary> public long? CreateOrgId { get; set; } /// <summary> /// å建è é¨é¨åç§° /// </summary> public string CreateOrgName { get; set; } /// <summary> /// å建æ¶é´ /// </summary> public DateTime? CreateTime { get; set; } /// <summary> /// ä¿®æ¹æ¶é´ /// </summary> public DateTime? UpdateTime { get; set; } /// <summary> /// å建人Id /// </summary> public long? CreateUserId { get; set; } /// <summary> /// å建人 /// </summary> public string CreateUserName { get; set; } /// <summary> /// ä¿®æ¹äººId /// </summary> public long? UpdateUserId { get; set; } /// <summary> /// ä¿®æ¹äºº /// </summary> public string UpdateUserName { get; set; } /// <summary> /// 软å é¤ /// </summary> public bool IsDelete { get; set; } } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,199 @@ using Admin.NET.Core.Service; using Admin.NET.Application.Entity; using Microsoft.AspNetCore.Http; using System.Data; using System.Web; using System.Text; namespace Admin.NET.Application; /// <summary> /// å è£ å®æå¯¹æ¥æå¡ /// </summary> [ApiDescriptionSettings(ApplicationConst.ThirdInterFaceGroupName, Order = 100)] public class MesPushPackageCodeService : IDynamicApiController, ITransient { private readonly SqlSugarRepository<MesPushPackageCode> _rep; public MesPushPackageCodeService(SqlSugarRepository<MesPushPackageCode> rep) { _rep = rep; } /// <summary> /// å页æ¥è¯¢å è£ å®æå¯¹æ¥ /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost] [ApiDescriptionSettings(Name = "Page")] [Description("MesPushPackageCode/Page")] public async Task<SqlSugarPagedList<MesPushPackageCodeOutput>> Page(MesPushPackageCodeInput input) { var query = CommonPageFilter(input); return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize); } /// <summary> /// ä¸å页æ¥è¯¢å è£ å®æå¯¹æ¥ /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpGet] [ApiDescriptionSettings(Name = "List")] [Description("MesPushPackageCode/List")] public async Task<List<MesPushPackageCodeOutput>> List([FromQuery] MesPushPackageCodeInput input) { var query = CommonPageFilter(input); return await query.OrderBuilder(input, "", "Id").Select<MesPushPackageCodeOutput>().ToListAsync(); } /// <summary> /// å¢å å è£ å®æå¯¹æ¥ /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost] [ApiDescriptionSettings(Name = "Add")] [Description("MesPushPackageCode/Add")] public async Task<long> Add(AddMesPushPackageCodeInput input) { var entity = input.Adapt<MesPushPackageCode>(); //é夿§éªè¯ await CheckExist(entity); await _rep.InsertAsync(entity); return entity.Id; } /// <summary> /// å é¤å è£ å®æå¯¹æ¥ /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost] [ApiDescriptionSettings(Name = "Delete")] [Description("MesPushPackageCode/Delete")] public async Task Delete(DeleteMesPushPackageCodeInput input) { var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002); //await _rep.FakeDeleteAsync(entity); //åå é¤ await _rep.DeleteAsync(entity); //çå é¤ } /// <summary> /// æ´æ°å è£ å®æå¯¹æ¥ /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost] [ApiDescriptionSettings(Name = "Update")] [Description("MesPushPackageCode/Update")] public async Task Update(UpdateMesPushPackageCodeInput input) { var entity = input.Adapt<MesPushPackageCode>(); //é夿§éªè¯ await CheckExist(entity,true); await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); } /// <summary> /// è·åå è£ å®æå¯¹æ¥ /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpGet] [ApiDescriptionSettings(Name = "Detail")] [Description("MesPushPackageCode/Detail")] public async Task<MesPushPackageCode> Detail([FromQuery] QueryByIdMesPushPackageCodeInput input) { return await _rep.GetFirstAsync(u => u.Id == input.Id); } #region ç§ææ¹æ³ /// <summary> /// å ¬å ±æ¥è¯¢å è£ å®æå¯¹æ¥æ¡ä»¶ /// </summary> /// <param name="input"></param> /// <returns></returns> private ISugarQueryable<MesPushPackageCodeOutput> CommonPageFilter(MesPushPackageCodeInput input) { var query = _rep.AsQueryable() .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.PackageCode.Contains(input.SearchKey.Trim()) || u.ApiMessage.Contains(input.SearchKey.Trim()) || u.CreateOrgName.Contains(input.SearchKey.Trim()) || u.CreateUserName.Contains(input.SearchKey.Trim()) || u.UpdateUserName.Contains(input.SearchKey.Trim()) ) .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim())) .WhereIF(input.PushStatus.HasValue, u => u.PushStatus == input.PushStatus) .WhereIF(input.PushNum>0, u => u.PushNum == input.PushNum) .WhereIF(!string.IsNullOrWhiteSpace(input.ApiMessage), u => u.ApiMessage.Contains(input.ApiMessage.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.CreateOrgName), u => u.CreateOrgName.Contains(input.CreateOrgName.Trim())) .Select<MesPushPackageCodeOutput>(); if(input.PushTimeRange != null && input.PushTimeRange.Count >0) { DateTime? start= input.PushTimeRange[0].Value.AddDays(-1); query = query.WhereIF(start.HasValue, u => u.PushTime > start); if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue) { var end = input.PushTimeRange[1].Value.AddDays(1); query = query.Where(u => u.PushTime < end); } } return query; } /// <summary> /// é夿§éªè¯ /// </summary> /// <param name="input">éªè¯å¯¹è±¡</param> /// <param name="isEdit">æ¯å¦æ¯ç¼è¾</param> /// <returns></returns> private async Task CheckExist( MesPushPackageCode input,bool isEdit=false) { //没æé ç½®ç»åæ ¡éªï¼ä¸éè¦éªé //没æé ç½®åç¬æ ¡éªï¼ä¸éè¦éªé } /// <summary> /// æ ¹æ®ç»åæ ¡éªååç¬æ ¡éªéªè¯æ°æ®æ¯å¦å·²åå¨-å¯¼å ¥æ¶éªè¯ /// </summary> /// <param name="inputs"></param> /// <returns></returns> private async Task CheckExisitForImport(List<MesPushPackageCode> inputs) { if (inputs?.Count <= 0) { throw Oops.Oh($"å¯¼å ¥æ°æ®ä¸è½ä¸ºç©º"); } //æ ¹æ®ç»åæ ¡éªéªè¯è¡¨æ ¼ä¸ä¸æ¯å¦å·²åå¨ç¸åæ°æ® //æ ¹æ®åç¬æ ¡éªéªè¯è¡¨æ ¼ä¸ä¸æ¯å¦å·²åå¨ç¸åæ°æ® } #endregion } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
@@ -1,4 +1,5 @@ using Admin.NET.Core; using Admin.NET.Core.Enum; using System.ComponentModel.DataAnnotations; namespace Admin.NET.Application; @@ -93,7 +94,7 @@ /// <summary> /// æ¨éç¶æ /// </summary> public int? PushStatus { get; set; } public PushStatusEnum? PushStatus { get; set; } /// <summary> /// æ¨éæ¬¡æ° LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs
@@ -124,24 +124,24 @@ { var value = await _rep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync(); if (value == null) throw Oops.Oh("å è£ å·ä¸åå¨"); if (value.PushStatus != (int)PushStatusEnum.NotPush || value.PushStatus != (int)PushStatusEnum.Pushing) throw Oops.Oh("é夿¨é"); if (value.PushStatus != PushStatusEnum.NotPush || value.PushStatus != PushStatusEnum.Pushing) throw Oops.Oh("é夿¨é"); string url = "http://localhost:8088/api/getwmstask/getwmstask"; var respon = await url.SetHttpMethod(HttpMethod.Post).SetBody(input).PostAsStringAsync(); var data = respon.FromJson<Respone>(); if (data.iState == 1) { value.PushStatus = (int)PushStatusEnum.PushSuccess; value.PushStatus = PushStatusEnum.PushSuccess; value.ApiMessage = data.message; value.PushNum++; } else { value.PushStatus = (int)PushStatusEnum.Pushing; value.PushStatus = PushStatusEnum.Pushing; value.ApiMessage = data.message; value.PushNum++; if (value.PushNum == 3) { value.PushStatus = (int)PushStatusEnum.PushFail; value.PushStatus = PushStatusEnum.PushFail; } } await _rep.UpdateAsync(value); @@ -231,7 +231,7 @@ } else { addItem.PushStatus = outPushStatus; } }