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

Merge branch 'ldjO' of http://deiniusoft.com:3000/root/ldj into ldjO

This commit is contained in:
bobwang 2025-09-15 10:19:38 +08:00
parent 39f46eff27 155f6f9dfb
commit 423a4065ea
22 changed files with 662 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WcfService1/BLL/lWmsOutPickRequest.cs
View File

@ -1061,6 +1061,7 @@ namespace DeiNiu.wms.Logical
wop.takeBy = empId;
wop.Update();
i++;
log.Debug(wop.description);
}
}
@ -3159,7 +3160,7 @@ namespace DeiNiu.wms.Logical
}
wop.takeBy = operId;
wop.Update();
log.Debug(wop.description);
}
}

2
WcfService1/BLL/lWmsPlate.cs
View File

@ -889,7 +889,7 @@ namespace DeiNiu.wms.Logical
{
toP.Update();
}
logPlate.Debug(string.Format("3 plate {0} start new trans {1}, top.ID {2}", toPlate, toP.transNo, toP.ID));
// logPlate.Debug(string.Format("3 plate {0} start new trans {1}, top.ID {2}", toPlate, toP.transNo, toP.ID));
foreach (WmsOutPickRequest req in requests)
{

1
epicksh/App.config
View File

@ -12,6 +12,7 @@
<add key="BaseUri" value="http://127.0.0.1:9998/DNlight/" />
<add key="DeskId" value="0" />
<add key="IsAutoBind" value="0" /><!-- 大于0则自动绑定订单和标签 -->
<add key="delayMs" value="2000" />
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">

BIN
epicksh/Microsoft.Data.ConnectionUI.Dialog.resources.dll Normal file
View File

Binary file not shown.

BIN
epicksh/Microsoft.Data.ConnectionUI.dll Normal file
View File

Binary file not shown.

83
epicksh/Microsoft.Data.ConnectionUI.xml Normal file
View File

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<doc>
<assembly>
<name>Microsoft.Data.ConnectionUI</name>
</assembly>
<members>
<member name="T:Microsoft.Data.ConnectionUI.IDataConnectionProperties">
<summary>Provides a set of methods and properties that enable the Data Connection dialog box to interact with a specified data provider's connection properties.</summary>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Add(System.String)">
<summary>Adds a custom property to the existing set of data connection properties recognized by the data provider.</summary>
<param name="propertyName">Name of the custom property added to the existing set of connection properties.</param>
<exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
<exception cref="T:System.InvalidOperationException">The specified connection properties are not extensible.</exception>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Contains(System.String)">
<summary>Tests whether a given set of connection properties contains a specified property.</summary>
<returns>true if the set of connection properties contains the specified property; otherwise, false.</returns>
<param name="propertyName">Name of the property whose presence is being tested.</param>
<exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
</member>
<member name="P:Microsoft.Data.ConnectionUI.IDataConnectionProperties.IsComplete">
<summary>Retrieves a Boolean value indicating whether the current set of connection property values provides sufficient information to open a connection to the data source.</summary>
<returns>true if the connection properties are complete; otherwise, false.</returns>
</member>
<member name="P:Microsoft.Data.ConnectionUI.IDataConnectionProperties.IsExtensible">
<summary>Retrieves a Boolean value indicating whether the specified set of connection properties is extensible; that is, whether it is possible to add and remove custom properties to the set of connection properties.</summary>
<returns>true if the connection properties are extensible; otherwise, false.</returns>
</member>
<member name="P:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Item(System.String)">
<summary>Represents a property instance of specified type and value.</summary>
<returns>A property object instance of the specified name.</returns>
<param name="propertyName">Name of the property.</param>
<exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
<exception cref="T:System.InvalidCastException">When setting a property value, the specified value cannot be converted to the property type.</exception>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Parse(System.String)">
<summary>Parses a data connection string that is built from a set of properties into the corresponding set of connection properties.</summary>
<param name="s">The connection string that is being parsed.</param>
<exception cref="T:System.ArgumentNullException">The <paramref name="s" /> parameter is null.</exception>
<exception cref="T:System.FormatException">The format specified for <paramref name="s" /> in not valid.</exception>
</member>
<member name="E:Microsoft.Data.ConnectionUI.IDataConnectionProperties.PropertyChanged">
<summary>Event that is raised when a data provider connection property is changed.</summary>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Remove(System.String)">
<summary>Removes a custom property from a specified set of data connection properties.</summary>
<param name="propertyName">Name of the custom property to be removed.</param>
<exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Reset">
<summary>Resets all connection properties and restores the object to its initial state.</summary>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Reset(System.String)">
<summary>Resets a specified connection property to its initial value.</summary>
<param name="propertyName">Name of the connection property being set to its default value.</param>
<exception cref="T:System.ArgumentNullException">The <paramref name="propertyName" /> parameter is null.</exception>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.Test">
<summary>Tests whether the current set of connection properties can successfully open a connection.</summary>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.ToDisplayString">
<summary>Retrieves a connection string for on-screen display reflecting the current set of connection properties, minus "sensitive" information that should not be displayed.</summary>
<returns>The set of connection properties that are suitable for display on-screen.</returns>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionProperties.ToFullString">
<summary>Retrieves the complete connection string representing the current set of connection properties.</summary>
<returns>The entire connection string, including secure or sensitive information.</returns>
</member>
<member name="T:Microsoft.Data.ConnectionUI.IDataConnectionUIControl">
<summary>Provides a set of methods and properties through which the Data Connection dialog box interacts with a third-party data connection user interface (UI) control, which is shown as the body of the Data Connection dialog box.</summary>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionUIControl.Initialize(Microsoft.Data.ConnectionUI.IDataConnectionProperties)">
<summary>Initializes the data connection user interface (UI) control with an instance of the <see cref="T:Microsoft.Data.ConnectionUI.IDataConnectionProperties" /> interface, which serves as the store for the data shown on the data connection UI control.</summary>
<param name="connectionProperties">The set of connection properties serving as stores for data shown on the data connection UI control.</param>
<exception cref="T:System.ArgumentNullException">The <paramref name="connectionProperties" /> parameter is null.</exception>
<exception cref="T:System.ArgumentException">The <paramref name="connectionProperties" /> parameter is not a valid implementation of DataConnectionProperties understood by this connection UI control.</exception>
</member>
<member name="M:Microsoft.Data.ConnectionUI.IDataConnectionUIControl.LoadProperties">
<summary>Loads connection property values into the data connection UI controls from an instance of the <see cref="T:Microsoft.Data.ConnectionUI.IDataConnectionProperties" /> interface.</summary>
</member>
</members>
</doc>

13
epicksh/SeedsImport.cs
View File

@ -57,7 +57,18 @@ namespace DeiNiu.wms.win
swithOperationType();
setValidationRule();
this.lcgSetup.Expanded = false;
int delayMs = 1000;
try
{
delayMs = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["delayMs"]);
}
catch
{
}
spinEdit1.Text = delayMs.ToString();
}

8
epicksh/SeedsImport.designer.cs generated
View File

@ -1466,8 +1466,8 @@
//
this.tabbedControlGroup2.Location = new System.Drawing.Point(0, 0);
this.tabbedControlGroup2.Name = "tabbedControlGroup2";
this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup9;
this.tabbedControlGroup2.SelectedTabPageIndex = 2;
this.tabbedControlGroup2.SelectedTabPage = this.lcgQuery;
this.tabbedControlGroup2.SelectedTabPageIndex = 0;
this.tabbedControlGroup2.Size = new System.Drawing.Size(1813, 146);
this.tabbedControlGroup2.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.lcgQuery,
@ -1971,7 +1971,7 @@
//
this.txtLocation.Location = new System.Drawing.Point(0, 0);
this.txtLocation.Name = "txtLocation";
this.txtLocation.Size = new System.Drawing.Size(100, 20);
this.txtLocation.Size = new System.Drawing.Size(100, 28);
this.txtLocation.TabIndex = 0;
//
// layoutControlGroup15
@ -1984,7 +1984,7 @@
//
this.textEdit2.Location = new System.Drawing.Point(196, 102);
this.textEdit2.Name = "textEdit2";
this.textEdit2.Size = new System.Drawing.Size(60, 20);
this.textEdit2.Size = new System.Drawing.Size(60, 28);
this.textEdit2.TabIndex = 11;
//
// SeedsImport

53
epicksh/epick.exe.config Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
</configSections>
<appSettings>
<add key="SqlconnWMS" value="Data Source=172.16.100.10;Initial Catalog=epickJiNuo;Persist Security Info=True;User ID=sa;Password=ginoptic;Pooling=true;Max Pool Size = 300; Min Pool Size=0; Connection Lifetime = 300;packet size=1000 " />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="BaseUri" value="http://127.0.0.1:9998/DNlight/" />
<add key="DeskId" value="0" />
<add key="IsAutoBind" value="0" />
<add key="vcnt" value="0" />
<add key="delayMs" value="3000" />
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<system.serviceModel>
<behaviors>
<serviceBehaviors>
<behavior name="">
<serviceMetadata httpGetEnabled="true" />
<serviceDebug includeExceptionDetailInFaults="false" />
</behavior>
</serviceBehaviors>
</behaviors>
<!--
<services>
<service name="DeiNiu.wms.win.ServiceLight">
<endpoint address="" binding="basicHttpBinding" contract="DeiNiu.wms.win.IServiceLight">
<identity>
<dns value="localhost" />
</identity>
</endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
<host>
<baseAddresses>
<add baseAddress="http://localhost:8732/ServiceLight/" />
</baseAddresses>
</host>
</service>
</services>
-->
</system.serviceModel>
</configuration>

5
epicksh/epickJInuo.csproj.user
View File

@ -1,4 +1,4 @@
<?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">
<PropertyGroup>
<PublishUrlHistory>publish\</PublishUrlHistory>
@ -10,4 +10,7 @@
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
<PropertyGroup>
<EnableSecurityDebugging>false</EnableSecurityDebugging>
</PropertyGroup>
</Project>

11
epicksh/epickJiNuo.csproj
View File

@ -129,10 +129,18 @@
<Reference Include="log4net">
<HintPath>..\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.ConnectionUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\Microsoft.Data.ConnectionUI.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.ConnectionUI.Dialog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\Microsoft.Data.ConnectionUI.Dialog.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.ConnectionUI.Dialog.resources, Version=10.0.0.0, Culture=zh-Hans, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\Microsoft.Data.ConnectionUI.Dialog.resources.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
@ -475,6 +483,9 @@
<Content Include="zh-Hans\DevExpress.XtraGrid.v16.2.resources.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="zh-Hans\Microsoft.Data.ConnectionUI.Dialog.resources.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0">

470
epicksh/main.cs
View File

@ -694,8 +694,8 @@ namespace DeiNiu.wms.win
else
{
// lbStatus.Text = "服务已启动";
lbUrl.Text = showSvr;
// lbStatus.Text = "服务启动失败";
// lbUrl.Text = showSvr;
lbUrl.Text = "服务启动失败";
// lbUrl.Text ="";
}
};
@ -1062,48 +1062,71 @@ namespace DeiNiu.wms.win
void lighOff(object source, System.Timers.ElapsedEventArgs e)
{
log.Debug("start light off auto , off list size: " + delayOffList.Count + ", validStatus " + validStatus);
if (delayOffList.Count == 0 || validStatus == enumOnlineStatus.禁用)
try
{
return;
}
List<ELight> lightsTmp = new List<ELight>();
Dictionary<int, List<ELight>> lights2Off = new Dictionary<int, List<ELight>>();
foreach (ELight light in delayOffList)
{
if (light.time.AddSeconds(delayOffInvterval) <= DateTime.Now)
if (delayOffList.Count == 0 || validStatus == enumOnlineStatus.禁用)
{
if (!lights2Off.Keys.Contains(light.port))
return;
}
log.Debug("start light off auto , off list size: " + delayOffList.Count + ", validStatus " + validStatus);
List<ELight> lightsTmp = new List<ELight>();
Dictionary<int, List<ELight>> lights2Off = new Dictionary<int, List<ELight>>();
List<ELight> delayOffList_TMP = delayOffList.ToList();
foreach (ELight light in delayOffList_TMP)
{
log.Debug(string.Format("checking light id {0} ,light time {1}, light which {2}, light port {3}",
light.lightId, light.time, light.which, light.port));
if (light.time.AddSeconds(delayOffInvterval) <= DateTime.Now)
{
lights2Off[light.port] = new List<ELight>();
if (!lights2Off.Keys.Contains(light.port))
{
lights2Off[light.port] = new List<ELight>();
}
lights2Off[light.port].Add(light);
log.Debug(string.Format("add to off list light id {0} ,light time {1}, light which {2}, light port {3}",
light.lightId, light.time, light.which, light.port));
}
lights2Off[light.port].Add(light);
log.Debug(string.Format("add to off list light id {0} ,light time {1}, light which {2}, light port {3}",
light.lightId, light.time, light.which, light.port));
else
{
log.Debug(string.Format("keep in list light id {0} ,light time {1}, light which {2}, light port {3}",
light.lightId, light.time, light.which, light.port));
lightsTmp.Add(light);
}
}
if (lights2Off.Count == 0) //无符合条件的灯光，返回
{
return;
}
if (delayOffList.Count == delayOffList_TMP.Count)
{
delayOffList = lightsTmp;
}
else
{
lightsTmp.Add(light);
log.Error("new light on during the light off process, keep the array list.");
}
}
if (lights2Off.Count == 0) //无符合条件的灯光，返回
foreach (int port in lights2Off.Keys)
{
turnOffLights(port, lights2Off[port]);
}
}
catch (Exception er)
{
return;
log.Error(er);
}
foreach (int port in lights2Off.Keys)
{
turnOffLights(port, lights2Off[port]);
}
delayOffList = lightsTmp;
}
int baseLightId = 5000;
@ -1112,117 +1135,176 @@ namespace DeiNiu.wms.win
List<ELight> delayOffList = new List<ELight>();
bool turnOnLights(int portNo, List<ELight> lights)
{
if (portNo == 0)
try
{
portNo = currentPort;
}
// bool rt=false;
List<ELight> fail = new List<ELight>();
log.Debug("start light on request ------>");
foreach (ELight el in lights)
{
if (el.lightId == 0)
{
continue;
}
channel_led id = new channel_led();
id.channel_id = baseLightId + el.lightId;
//id.config_word = led_rgb;
id.color = el.which;
id.state = 1;
if (el.port == 0)
{
el.port = portNo;
}
if (!pick.turnOnLight(el.port, id))
{
log.Debug(getJson(el) + " light on failed. redo...");
fail.Add(el);
}
else
log.Debug("start light on request ------>");
if (portNo == 0)
{
el.time = DateTime.Now;
delayOffList.Add(el);
log.Debug(getJson(el));
portNo = currentPort;
log.Debug(" port no is 0, return false");
return false;
}
// bool rt=false;
List<ELight> fail = new List<ELight>();
foreach (ELight el in lights)
{
if (el.lightId == 0)
{
fail.Add(el);
continue;
}
channel_led id = new channel_led();
id.channel_id = baseLightId + el.lightId;
//id.config_word = led_rgb;
id.color = el.which;
id.state = 1;
if (el.port == 0)
{
el.port = portNo;
}
if (!pick.turnOnLight(el.port, id))
{
log.Debug(getJson(el) + " light on failed. redo...");
fail.Add(el);
}
else
{
el.time = DateTime.Now;
delayOffList.Add(el);
log.Debug("add off list:" + getJson(el));
}
Thread.Sleep(50);
}
Thread.Sleep(50);
if (fail.Count > 0)
{
// turnOnLights(portNo, fail);
}
log.Debug("<----------- end light on request ");
return fail.Count == 0;
}
if (fail.Count > 0)
catch (Exception e)
{
// turnOnLights(portNo, fail);
log.Error(e);
}
log.Debug("<----------- end light on request ");
return fail.Count == 0;
return false;
}
bool turnOffLights(int portNo, List<ELight> lights)
{
if (portNo == 0)
try
{
portNo = currentPort;
}
bool rt = false;
List<ELight> fail = new List<ELight>();
log.Debug("start light off request ------>");
foreach (ELight el in lights)
{
if (el.lightId == 0)
if (portNo == 0)
{
continue;
portNo = currentPort;
}
if (el.time <DateTime.Now.AddDays(-10) && validStatus != enumOnlineStatus.禁用) //过滤非定时熄灯的请求
bool rt = false;
List<ELight> fail = new List<ELight>();
log.Debug("start light off request ------>");
foreach (ELight el in lights)
{
// continue;
bool inList = false; // in the 2 off list, to off the light, or it has been auto off to skip
foreach (ELight lt in delayOffList)
{
if (lt.lightId == el.lightId && lt.port == el.port && lt.which == el.which)
{
inList = true;
break;
}
}
if (!inList) //如果在等待熄灯的队列里，则执行熄灯，不在队列则表明已经熄灯
if (el.lightId == 0)
{
continue;
}
if (el.time < DateTime.Now.AddDays(-10) && validStatus != enumOnlineStatus.禁用) //过滤非定时熄灯的请求
{
// continue;
bool inList = false; // in the 2 off list, to off the light, or it has been auto off to skip
foreach (ELight lt in delayOffList)
{
if (lt.lightId == el.lightId && lt.port == el.port && lt.which == el.which)
{
inList = true;
break;
}
}
if (!inList) //如果在等待熄灯的队列里，则执行熄灯，不在队列则表明已经熄灯
{
// continue;
}
}
channel_led id = new channel_led();
id.channel_id = baseLightId + el.lightId;
//id.config_word = led_rgb;
id.color = el.which;
id.state = 1;
if (el.port == 0)
{
el.port = portNo;
}
if (!pick.turnOffLight(el.port, id))
{
log.Debug(getJson(el) + " light off failed. redo...");
delayOffList.Insert(0, el);
fail.Add(el);
}
else
{
int cnt =delayOffList.Count;
try
{
for (int i = 0; i < cnt; i++)
{
if (delayOffList[i].lightId == el.lightId && delayOffList[i].which == el.which &&
delayOffList[i].time == el.time)
{
delayOffList.RemoveAt(i);
cnt--;
log.Debug("light removed from the list...... ");
}
}
}
catch (Exception e)
{
log.Error(e);
}
/*
if (delayOffList.Contains(el))
{
delayOffList.Remove(el);
log.Debug("light removed from the list... ");
}
*/
log.Debug("light off succeed:" + getJson(el));
}
Thread.Sleep(50);
}
channel_led id = new channel_led();
id.channel_id = baseLightId + el.lightId;
//id.config_word = led_rgb;
id.color = el.which;
id.state = 1;
if (el.port == 0)
if (fail.Count > 0)
{
el.port = portNo;
}
// turnOffLights(portNo, fail);
if (!pick.turnOffLight(el.port, id))
{
log.Debug(getJson(el) + " light off failed. redo...");
delayOffList.Insert(0, el);
fail.Add(el);
}
else
{
log.Debug("light off succeed:" + getJson(el));
}
Thread.Sleep(50);
log.Debug("<----------- end light off request ");
return fail.Count == 0;
}
if (fail.Count > 0)
catch(Exception er)
{
// turnOffLights(portNo, fail);
log.Error(er);
}
log.Debug("<----------- end light off request ");
return fail.Count == 0;
return false;
}
@ -1285,98 +1367,101 @@ namespace DeiNiu.wms.win
log.Error(ex);
}
*/
validSvr();
// string json2 = JsonConvert.SerializeObject(wonline);
string msg = "";
loop++;
if (wonline.id > 0)
{
validStatus = (enumOnlineStatus)wonline.state;
// msg = string.Format("尊敬的{0}，授权状态：【{1}】, {2}", wonline.custName, validStatus,wonline.msg);
msg = wonline.msg;
//this.navBarControl1.BeginUpdate();
//this.navBarControl1.Groups.Clear();
//this.navBarControl1.EndUpdate();
if (validStatus == enumOnlineStatus.正常)
try
{
validSvr();
// string json2 = JsonConvert.SerializeObject(wonline);
string msg = "";
loop++;
if (wonline.id > 0)
{
//createMenus();
loop = 0;
}
else if (validStatus == enumOnlineStatus.试用)
{
//createMenus();
}
else if (validStatus == enumOnlineStatus.过期)
{
loop = loop > maxLoop ? loop : maxLoop;
// msg = string.Format("尊敬的{0}，授权状态：【{1}】, {2}", wonline.custName, validStatus, wonline.msg);
}
else if (validStatus == enumOnlineStatus.加料)
{
loop = maxLoop - 5;
}
else if (validStatus == enumOnlineStatus.禁用)
{
loop = loop > maxLoop ? loop : maxLoop;
if (new Random().Next(1, 10) < 7)
validStatus = (enumOnlineStatus)wonline.state;
// msg = string.Format("尊敬的{0}，授权状态：【{1}】, {2}", wonline.custName, validStatus,wonline.msg);
msg = wonline.msg;
//this.navBarControl1.BeginUpdate();
//this.navBarControl1.Groups.Clear();
//this.navBarControl1.EndUpdate();
if (validStatus == enumOnlineStatus.正常)
{
validStatus = enumOnlineStatus.试用;
//createMenus();
loop = 0;
}
else if (validStatus == enumOnlineStatus.试用)
{
//createMenus();
}
else if (validStatus == enumOnlineStatus.过期)
{
loop = loop > maxLoop ? loop : maxLoop;
// msg = string.Format("尊敬的{0}，授权状态：【{1}】, {2}", wonline.custName, validStatus, wonline.msg);
}
else if (validStatus == enumOnlineStatus.加料)
{
loop = maxLoop - 5;
}
else if (validStatus == enumOnlineStatus.禁用)
{
loop = loop > maxLoop ? loop : maxLoop;
if (new Random().Next(1, 10) < 7)
{
validStatus = enumOnlineStatus.试用;
}
}
}
vcnt = loop + "";
if (validStatus != enumOnlineStatus.禁用)
{
if (loop > maxLoop)
{
validStatus = enumOnlineStatus.过期;
// msg = string.Format("尊敬的客户{0} 授权状态：【{1}】 {2}", wonline.custName, validStatus, wonline.msg);
}
if (loop > maxLoop * 2)
{
validStatus = enumOnlineStatus.加料;
// msg = string.Format("尊敬的客户{0} 授权状态：【{1}】 {2}", wonline.custName, validStatus, wonline.msg);
WmsConstants.IS_ONLINE_RESTRICT = true;
}
}
}
vcnt = loop + "";
if (validStatus != enumOnlineStatus.禁用)
{
if (loop > maxLoop)
{
validStatus = enumOnlineStatus.过期;
// msg = string.Format("尊敬的客户{0} 授权状态：【{1}】 {2}", wonline.custName, validStatus, wonline.msg);
}
if (loop > maxLoop * 2)
{
validStatus = enumOnlineStatus.加料;
// msg = string.Format("尊敬的客户{0} 授权状态：【{1}】 {2}", wonline.custName, validStatus, wonline.msg);
WmsConstants.IS_ONLINE_RESTRICT = true;
}
}
WriteConfig("vcnt", vcnt);
WriteConfig("vcnt", vcnt);
#if DEBUG
msg = string.Format(" {0} 授权状态：【{1}】 ",msg, validStatus );
#endif
//msg += new Random().Next(1, 10);
//msg += new Random().Next(1, 10);
if (InvokeRequired)
{
this.Invoke(new showStatus(delegate ()
if (InvokeRequired)
{
this.Invoke(new showStatus(delegate ()
{
lbUrl.Text = msg;
}));
}
else
{
lbUrl.Text = msg;
}));
}
}
else
catch (Exception e)
{
lbUrl.Text = msg;
log.Error(e);
}
}
private void checkOnline()
{
@ -1390,6 +1475,7 @@ namespace DeiNiu.wms.win
}
catch (Exception ex)
{
log.Error(ex);
showErrorMsg(ex.Message);
}

222
epicksh/main.resx
View File

@ -118,139 +118,139 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="dxValidationProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>205, 17</value>
<value>17, 17</value>
</metadata>
<metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
<value>17, 62</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="barButtonItem2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
FywS6xgmGpz3AAAAAElFTkSuQmCC
</value>
</data>
<data name="barButtonItem2.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="btnConn.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAtdEVYdFRpdGxlAERCO1NvdXJjZTtTdG9yO2RhdGFzb3VyY2U7RGF0YWJhc2U7RWRpdCj2upwA
AALOSURBVDhPhZNtSJNRGIZfM52faUH+SIWQIAsJSQh/WEbL1Fyp+IEkUoSyUFhZaqBQY4okQ82pIM6o
zFgwoWxqbk02Uzdpkvgxs+FHJi5zzkwl0enuznktMMs6cP85PNd13uec52XIciBx1JQnJHRJkip0lUnN
OknCkK4iEZ3l8UMacWzL62KepFkYlUjqdtN6AMyv0OWor0puNylEML+th3X4BZYmVbB/7cGiSY5ZQzUm
1SL01/OhEkV3Usl2gZO+MhFYmwFWp4GVCdiXR2Bf7IN9XocNSzvWZxSwTcuhEkZSwnm7wLmrLB42ciLW
vvyUjBHJMNYXDFj+IIdVXw6rNg+vCriU4GwXcN6IY7E6q4RtYZAILFgzN+CbUYDP6ksYEHPRVxQOc2MK
dDXXKeFGQu/CkYTeH+OiLeb9V2DRCjHUIkWbMKREc/c4GgVHignrRAWu6sKofwpMjwWw9j9DT20GJl7G
Y8M+hvcyHqri/O6xAuWdczsKRmXZmGyXYlCWibHnF1nYNp6F7vxAlHL3s5fg1prP/atgrleET5o69D5I
h0kew8IrxnR05BxChzgMOcGeZVTgrsgN/0OwNF6B2WEZDAQeeRrFwouGNGgEB6EuDIUgyOM+PZwVNN0M
+11gUWJhqgl9smswPuSy8Jw2CepMf7QWhIB/2E1COA+SXVTg0sA/0dZdfRUT2jrMj+qxOv8OA11S6MQR
LGxuvgAV3xdNt47hSoBLDWE8KZzqQ19z0+JemhyUIU0LVjy6HGw0yKs2crMLoagtxvcpPZQZvpBnBSLV
n1NLar0p81EWwSTto6OwuehA0DelPVG7b/DZvPEBfRuelNxG0ekApBxwpiezsEl6ijFJTzJxXgTbOpZb
xnOPty8Xnj6hk67eR2v89nicIXtszzwPB4Ymxp1hztOdHQS0OS+SvSSkdPM3jibfF+XKMJEkVHIjgMP8
AHB6PnWgnVZiAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAC10RVh0VGl0
bGUAREI7U291cmNlO1N0b3I7ZGF0YXNvdXJjZTtEYXRhYmFzZTtFZGl0KPa6nAAAAs5JREFUOE+Fk21I
k1EYhl8znZ9pQf5IhZAgCwlJCH9YRsvUXKn4gSRShLJQWFlqoFBjiiRDzakgzqjMWDChbGpuTTZTN2mS
+DGz4UcmLnPOTCXR6e7OeS0wyzpw/zk813Xe55znZchyIHHUlCckdEmSKnSVSc06ScKQriIRneXxQxpx
bMvrYp6kWRiVSOp203oAzK/Q5aivSm43KUQwv62HdfgFliZVsH/twaJJjllDNSbVIvTX86ESRXdSyXaB
k74yEVibAVangZUJ2JdHYF/sg31ehw1LO9ZnFLBNy6ESRlLCebvAuassHjZyIta+/JSMEckw1hcMWP4g
h1VfDqs2D68KuJTgbBdw3ohjsTqrhG1hkAgsWDM34JtRgM/qSxgQc9FXFA5zYwp0Ndcp4UZC78KRhN4f
46It5v1XYNEKMdQiRZswpERz9zgaBUeKCetEBa7qwqh/CkyPBbD2P0NPbQYmXsZjwz6G9zIequL87rEC
5Z1zOwpGZdmYbJdiUJaJsecXWdg2noXu/ECUcvezl+DWms/9q2CuV4RPmjr0PkiHSR7DwivGdHTkHEKH
OAw5wZ5lVOCuyA3/Q7A0XoHZYRkMBB55GsXCi4Y0aAQHoS4MhSDI4z49nBU03Qz7XWBRYmGqCX2yazA+
5LLwnDYJ6kx/tBaEgH/YTUI4D5JdVODSwD/R1l19FRPaOsyP6rE6/w4DXVLoxBEsbG6+ABXfF023juFK
gEsNYTwpnOpDX3PT4l6aHJQhTQtWPLocbDTIqzZyswuhqC3G9yk9lBm+kGcFItWfU0tqvSnzURbBJO2j
o7C56EDQN6U9Ubtv8Nm88QF9G56U3EbR6QCkHHCmJ7OwSXqKMUlPMnFeBNs6llvGc4+3LxeePqGTrt5H
a/z2eJwhe2zPPA8HhibGnWHO050dBLQ5L5K9JKR08zeOJt8X5cowkSRUciOAw/wAcHo+daCdVmIAAAAA
SUVORK5CYII=
</value>
</data>
<data name="btnConn.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<metadata name="xtraTabbedMdiManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>387, 17</value>
<value>17, 107</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>729, 17</value>
<value>17, 197</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@ -1385,6 +1385,6 @@
</value>
</data>
<metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>589, 17</value>
<value>17, 152</value>
</metadata>
</root>

BIN
epicksh/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

0
epicksh/obj/Release/build.force Normal file
View File

BIN
epicksh/obj/Release/epickJiNuo.csproj.AssemblyReference.cache
View File

Binary file not shown.

3
epicksh/wcf/ServiceLight.cs
View File

@ -208,6 +208,7 @@ namespace DeiNiu.wms.win
public bool turnOnLight(int lightId, byte which, int portNo)
{
log.Debug(string.Format("start turnOn light id {0}, which {1}, portno {2}", lightId, which, portNo));
List<ELight> els = new List<ELight>();
ELight el = new ELight();
el.port = portNo;
@ -286,7 +287,7 @@ namespace DeiNiu.wms.win
log.Debug(string.Format(" to turn on light Id {0}, which {1}, port {2}", el.lightId, el.which, el.port));
if (el.lightId == 0) {
log.Debug(string.Format(" !!!-----No light found for the barcode {0}} ----!!!", barcode));
log.Debug(string.Format(" !!!-----No light found for the barcode {0} ----!!!", barcode));
return false;
}

BIN
epicksh/zh-Hans/Microsoft.Data.ConnectionUI.Dialog.resources.dll Normal file
View File

Binary file not shown.

BIN
sql.sql
View File

Binary file not shown.

192
winform/出库/GoodsOutTasks.Designer.cs generated
View File

@ -81,6 +81,13 @@
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem9 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem8 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
@ -103,13 +110,6 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem9 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
this.emptySpaceItem8 = new DevExpress.XtraLayout.EmptySpaceItem();
this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
@ -155,6 +155,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
@ -177,13 +184,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).BeginInit();
this.SuspendLayout();
//
// ribbon
@ -828,13 +828,86 @@
//
this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 0);
this.tabbedControlGroup1.Name = "tabbedControlGroup1";
this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup2;
this.tabbedControlGroup1.SelectedTabPageIndex = 1;
this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup10;
this.tabbedControlGroup1.SelectedTabPageIndex = 0;
this.tabbedControlGroup1.Size = new System.Drawing.Size(1814, 210);
this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlGroup10,
this.layoutControlGroup2});
//
// layoutControlGroup2
//
this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24,
this.layoutControlItem25,
this.layoutControlItem17,
this.emptySpaceItem9,
this.emptySpaceItem5,
this.emptySpaceItem8});
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.OptionsItemText.TextToControlDistance = 5;
this.layoutControlGroup2.Size = new System.Drawing.Size(1775, 136);
this.layoutControlGroup2.Text = "分配任务";
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txtEmpId;
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.MinSize = new System.Drawing.Size(111, 36);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.Size = new System.Drawing.Size(372, 69);
this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem24.Text = "员工名称";
this.layoutControlItem24.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.simpleButton1;
this.layoutControlItem25.Location = new System.Drawing.Point(392, 0);
this.layoutControlItem25.MinSize = new System.Drawing.Size(88, 46);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.Size = new System.Drawing.Size(136, 68);
this.layoutControlItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbemp;
this.layoutControlItem17.Location = new System.Drawing.Point(0, 69);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.Size = new System.Drawing.Size(372, 67);
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
// emptySpaceItem9
//
this.emptySpaceItem9.AllowHotTrack = false;
this.emptySpaceItem9.Location = new System.Drawing.Point(392, 68);
this.emptySpaceItem9.MaxSize = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.MinSize = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.Name = "emptySpaceItem9";
this.emptySpaceItem9.Size = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem5
//
this.emptySpaceItem5.AllowHotTrack = false;
this.emptySpaceItem5.Location = new System.Drawing.Point(528, 0);
this.emptySpaceItem5.Name = "emptySpaceItem5";
this.emptySpaceItem5.Size = new System.Drawing.Size(1247, 136);
this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem8
//
this.emptySpaceItem8.AllowHotTrack = false;
this.emptySpaceItem8.Location = new System.Drawing.Point(372, 0);
this.emptySpaceItem8.Name = "emptySpaceItem8";
this.emptySpaceItem8.Size = new System.Drawing.Size(20, 136);
this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlGroup10
//
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@ -1135,79 +1208,6 @@
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
//
// layoutControlGroup2
//
this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24,
this.layoutControlItem25,
this.layoutControlItem17,
this.emptySpaceItem9,
this.emptySpaceItem5,
this.emptySpaceItem8});
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.OptionsItemText.TextToControlDistance = 5;
this.layoutControlGroup2.Size = new System.Drawing.Size(1775, 136);
this.layoutControlGroup2.Text = "分配任务";
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txtEmpId;
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.MinSize = new System.Drawing.Size(111, 36);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.Size = new System.Drawing.Size(372, 69);
this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem24.Text = "员工名称";
this.layoutControlItem24.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.simpleButton1;
this.layoutControlItem25.Location = new System.Drawing.Point(392, 0);
this.layoutControlItem25.MinSize = new System.Drawing.Size(88, 46);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.Size = new System.Drawing.Size(136, 68);
this.layoutControlItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbemp;
this.layoutControlItem17.Location = new System.Drawing.Point(0, 69);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.Size = new System.Drawing.Size(372, 67);
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
// emptySpaceItem9
//
this.emptySpaceItem9.AllowHotTrack = false;
this.emptySpaceItem9.Location = new System.Drawing.Point(392, 68);
this.emptySpaceItem9.MaxSize = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.MinSize = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.Name = "emptySpaceItem9";
this.emptySpaceItem9.Size = new System.Drawing.Size(136, 68);
this.emptySpaceItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem5
//
this.emptySpaceItem5.AllowHotTrack = false;
this.emptySpaceItem5.Location = new System.Drawing.Point(528, 0);
this.emptySpaceItem5.Name = "emptySpaceItem5";
this.emptySpaceItem5.Size = new System.Drawing.Size(1247, 136);
this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
//
// emptySpaceItem8
//
this.emptySpaceItem8.AllowHotTrack = false;
this.emptySpaceItem8.Location = new System.Drawing.Point(372, 0);
this.emptySpaceItem8.Name = "emptySpaceItem8";
this.emptySpaceItem8.Size = new System.Drawing.Size(20, 136);
this.emptySpaceItem8.TextSize = new System.Drawing.Size(0, 0);
//
// btnQuery
//
this.btnQuery.Location = new System.Drawing.Point(1144, 33);
@ -1272,6 +1272,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
@ -1294,13 +1301,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem8)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

2
winform/出库/GoodsOutTasks.cs
View File

@ -1166,7 +1166,7 @@ namespace DeiNiu.wms.win
if (!checkPermission(WmsConstants.SPECIAL_VALID_REASSIN_TASK_BY_ID))
{
showErrorMsg("权限不足");
return;
return;
}
if (em.ID == 0)

6
winform/基础资料/LotSetup.cs
View File

@ -1204,10 +1204,10 @@ namespace DeiNiu.wms.win
{
// stkLocClient.formatLocName();
// stkLocClient.Close();
// stkLocClient.initalSkus(true, 11);
stkLocClient.initalSkus(true, 11);
// stkLocClient.initalSkus(true, 13);
// stkLocClient.initalSkus(true, 15);
stkLocClient.initalSkus(true, 0);
stkLocClient.initalSkus(true, 15);
// stkLocClient.initalSkus(true, 0);
closeClient();
// stkLocClient.initalSkus(true, 3);
// closeClient();