hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hanlihui520:SanYing_DAS
Branches Tags
hanlihui520:master hanlihui520:GuangZhouHuiFeng_DAS hanlihui520:NanJing711_DAS hanlihui520:WuXi_DingShi_DAS hanlihui520:taitan_dengdai_songjiang hanlihui520:ZhuYou_Wcs hanlihui520:beijing_zhongliang_DAS hanlihui520:YingJiYiYuan_DPS hanlihui520:FuYuan_DPS hanlihui520:SanYing_DAS hanlihui520:taitan_dengdai
..
compare: hanlihui520:taitan_dengdai_songjiang
Branches Tags
hanlihui520:GuangZhouHuiFeng_DAS hanlihui520:NanJing711_DAS hanlihui520:WuXi_DingShi_DAS hanlihui520:taitan_dengdai_songjiang hanlihui520:ZhuYou_Wcs hanlihui520:beijing_zhongliang_DAS hanlihui520:YingJiYiYuan_DPS hanlihui520:FuYuan_DPS hanlihui520:SanYing_DAS hanlihui520:taitan_dengdai hanlihui520:master

10 Commits
SanYing_DA ... taitan_den

Author SHA1 Message Date
jl
36e123d79e 2025-01-13 13:47:28 +08:00
jl
c82154ff51 2024-12-31 17:16:22 +08:00
jl
a3c29b5bf8 增加小格口绑定 2024-01-15 17:37:47 +08:00
jl
36a20b88ce 2024-01-04 15:30:23 +08:00
jl
40557a235e 2023-12-05 14:35:20 +08:00
jl
9d64ef5d7a 2023-04-23 17:12:13 +08:00
jl
6d016714ad 2023-04-21 15:47:55 +08:00
jl
8c07d147d5 2023-04-21 11:44:47 +08:00
jl
3a08c033ba 2023-04-20 16:36:30 +08:00
jl
ab8ac9cce6 2023-04-17 14:10:34 +08:00
28 changed files with 1979 additions and 1863 deletions
Expand all files Collapse all files

BIN
DLL/LightContrl.dll Normal file
View File

Binary file not shown.

BIN
DLL/LightContrl.pdb Normal file
View File

Binary file not shown.

20
Epost.BLL/AddressstorageBLL.cs
View File

@ -374,5 +374,25 @@ namespace Epost.BLL
return dal.GetAddressListByByPage(strWhere, orderby, startIndex, endIndex, out recordCount);
}
#endregion
#region 灯带
#region 查询设备信息
public DataTable QueryAddrList(string strwhere)
{
return dal.QueryAddrList(strwhere);
}
#endregion
#region 查询设备信息
public DataTable QueryControlList(string strwhere)
{
return dal.QueryControlList(strwhere);
}
#endregion
#endregion
}
}

188
Epost.BLL/CommandBLL.cs
View File

@ -4,6 +4,7 @@ using Epost.DAL;
using Epost.DAL.Cache;
using Epost.DAL.Enum;
using Epost.Model;
using LightContrl;
using System;
using System.Collections.Generic;
using System.Configuration;
@ -11,6 +12,7 @@ using System.Data;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using static Epost.Common.LogHelper;
@ -28,6 +30,8 @@ namespace Epost.BLL
ConfigurationOperator txtbll = new ConfigurationOperator();
string IP = ConfigurationManager.AppSettings["WebAPIUrl"];
LightControlCacheDAL cachedal = new LightControlCacheDAL();
MainControl lig = new MainControl();
#region 初始化数据
public ResultModel Initialization_M(bool isback = true)
{
@ -36,7 +40,6 @@ namespace Epost.BLL
try
{
DataTable dt = addrBLL.getControlList();
bool result = false;
if (dt != null && dt.Rows.Count > 0)
{
foreach (DataRow item in dt.Rows)
@ -58,6 +61,13 @@ namespace Epost.BLL
model = new LabelParamModel();
model.ControlIP = item["ControlIP"].ToString();
model.Address = "9999";
model.Parameter = "job";
model.Command = "START_POLLING";
model.Timeout = "0.03";
list.Add(model);
model = new LabelParamModel();
model.ControlIP = item["ControlIP"].ToString();
model.Address = "9999";
model.Parameter = "11111000";
model.Command = "UNLOCK";
model.Timeout = "0.5";
@ -83,6 +93,72 @@ namespace Epost.BLL
}
return resultModel;
}
//public ResultModel Initialization_M(bool isback = true)
//{
// ResultModel resultModel = new ResultModel();
// resultModel.result = "0";
// resultModel.msg = "成功";
// List<LabelParamModel> list = new List<LabelParamModel>();
// try
// {
// DataTable dt = addrBLL.QueryControlList("");
// if (dt != null && dt.Rows.Count > 0)
// {
// foreach (DataRow item in dt.Rows)
// {
// string ipaddress = item["controlip"].ToString().Trim();
// List<LightcontrolModel> conlist = cachedal.GetControlList().FindAll(o => o.controlip == ipaddress);
// if (conlist != null && conlist.Count > 0)
// {
// LogHelper.WriteLogInfo(ipaddress + "已连接！");
// Ledonoff_dengdai("0", "");
// }
// else
// {
// int port = Convert.ToInt32(item["port"].ToString().Trim());
// int timeout = 2000;
// bool bo = lig.Connect(ipaddress, port, timeout);//timeout 毫秒
// if (bo)
// {
// LightcontrolModel model = new LightcontrolModel();
// model.controlip = ipaddress;
// model.maincontrol = lig;
// model.port = port;
// cachedal.UpdateControlList(new List<LightcontrolModel> { model }, EcontrolCommend.Create);
// Ledonoff_dengdai("0", "");
// }
// else
// {
// LogHelper.WriteLogInfo("连接失败" + ipaddress);
// resultModel.result = "-1";
// resultModel.msg = "连接失败" + ipaddress;
// return resultModel;
// }
// }
// }
// }
// return resultModel;
// }
// catch (Exception ex)
// {
// resultModel.result = "0";
// resultModel.msg = "初始化失败！";
// LogHelper.WriteLogInfo("初始化异常：" + ex.Message);
// }
// return resultModel;
//}
#endregion
#region 设备检测 查询所有标签
@ -501,7 +577,6 @@ namespace Epost.BLL
public void CloseALL_M()
{
DataTable dt = addrBLL.getControlList();
if (dt != null && dt.Rows.Count > 0)
{
foreach (DataRow item in dt.Rows)
@ -510,17 +585,116 @@ namespace Epost.BLL
LabelParamModel model = new LabelParamModel();
model.ControlIP = item["ControlIP"].ToString();
FORMATE_JOB_DATA(model);
LED_OFF_CLEAR(item["ControlIP"].ToString());
}
}
//List<LightcontrolModel> conlist = cachedal.GetControlList();
//if (conlist.Any() && conlist.Count > 0)
//{
// Ledonoff_dengdai("0","");
// Thread.Sleep(500);
// foreach (LightcontrolModel con in conlist)
// {
// bool b = con.maincontrol.DisConnect(con.controlip, con.port);
// LogHelper.WriteLogInfo(b + "断开连接" + con.controlip + "==" + con.port);
// }
//}
//cachedal.ClearControlList();
}
#endregion
#region 亮灭灯带所有格口
public void Ledonoff_dengdai(string lightType, string lightcolor)
{
DataTable dt = addrBLL.QueryControlList(" ");
if (dt != null && dt.Rows.Count > 0)
{
foreach (DataRow rowitem in dt.Rows)
{
string ipaddress = rowitem["controlip"].ToString().Trim();
List<LightcontrolModel> conlist = cachedal.GetControlList().FindAll(o => o.controlip == ipaddress);
if (conlist != null && conlist.Count > 0)
{
MainControl control = conlist.FirstOrDefault().maincontrol;
bool bo = false;
string Address = dt.Rows[0]["address"].ToString().Trim();
string resstr = string.Empty;
if (lightType == "0")
{
bo = control.LED_OFF(ipaddress, Address, ref resstr);
}
else
{
bo = control.LED_ON(ipaddress, Address, ref resstr, "3", "0", lightcolor);
}
}
}
}
}
#endregion
#region 点亮/熄灭灯带格口
public void display_dengdai(string location,string color)
{
DataTable dt = addrBLL.QueryControlList("");
if (dt != null && dt.Rows.Count > 0)
{
foreach (DataRow rowitem in dt.Rows)
{
string ipaddress = rowitem["controlip"].ToString().Trim();
List<LightcontrolModel> conlist = cachedal.GetControlList().FindAll(o => o.controlip == ipaddress);
if (conlist != null && conlist.Count > 0)
{
MainControl control = conlist.FirstOrDefault().maincontrol;
DataTable locdt = addrBLL.QueryAddrList(" and location ='" + location + "' and controlip='" + ipaddress + "'");
if (locdt != null && locdt.Rows.Count > 0)
{
List<LightParagraph> list = new List<LightParagraph>();
string address = locdt.Rows[0]["address"].ToString().Trim();
foreach (DataRow locitem in locdt.Rows)
{
//根据播种墙号、格口号查询播种墙ip及灯带地址
LightParagraph show = new LightParagraph();
show.WayNu = Convert.ToInt32(locitem["wayno"].ToString().Trim());
show.LightBeganNu = locitem["beginno"].ToString().Trim();
show.LightEndNu = locitem["endno"].ToString().Trim();
show.LightColor = color; //1:蓝色 2:绿色 3：青色 4:红色 5：紫色 6黄色 7白色
show.Brightness = "9";//亮度 1-9
list.Add(show);
}
string resstr = string.Empty;
bool bo = control.LED_By_Paragraph(ipaddress, address, list, ref resstr);
if (bo)
{
LogHelper.WriteLogInfo("成功" + ipaddress + "list:" + JsonHelper.SerializeObject(list));
}
else
{
LogHelper.WriteLogInfo("失败" + ipaddress + "list:" + JsonHelper.SerializeObject(list), LogHelper.Log_Type.ERROR);
}
}
}
else
{
LogHelper.WriteLogInfo("请先连接设备!");
}
}
}
}
#endregion
#region 根据区解锁标签
public void UNLOCK_M(List<JobModel> offList)
{
@ -628,7 +802,7 @@ namespace Epost.BLL
lablemodel.Command = "DISPLAY_JOB";
lablemodel.Uid = show.Uid;
if (string.IsNullOrEmpty(show.Uid))
{ lablemodel.Uid = show.No + addritem["address"].ToString(); }
{ lablemodel.Uid = addritem["address"].ToString(); }
lablemodel.Mode = show.Color + "0";
if (addritem["addresstype"].ToString() == "2")

3
Epost.BLL/Epost.BLL.csproj
View File

@ -79,6 +79,9 @@
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="LightContrl">
<HintPath>..\DLL\LightContrl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />

35
Epost.BLL/ErrorLogBLL.cs
View File

@ -12,9 +12,10 @@ using static Epost.DAL.Enum.SqlLogType;
namespace Epost.BLL
{
public class ErrorLogBLL
public class ErrorLogBLL
{
ErrorLogDAL dal = new ErrorLogDAL();
#region 添加日志
public bool InsertErrorLog(ErrorLogModel model)
{
@ -79,23 +80,51 @@ namespace Epost.BLL
public void SaveSysytemError(string caozuo, string error)
{
string username = string.Empty;
ErrorLogBLL logBLL = new ErrorLogBLL();
ErrorLogModel error_model = new ErrorLogModel();
error_model.Type = "2";
error_model.Remark = caozuo + "" + error;
error_model.Title = caozuo;
error_model.Remark = error;
error_model.UserName = username;
logBLL.InsertErrorLog(error_model);
}
public void SaveOperateError(string caozuo, string error)
{
string username = string.Empty;
ErrorLogBLL logBLL = new ErrorLogBLL();
ErrorLogModel error_model = new ErrorLogModel();
error_model.Type = "3";
error_model.Remark = caozuo + "操作" + error;
error_model.Title = caozuo;
error_model.Remark = error;
error_model.UserName = username;
logBLL.InsertErrorLog(error_model);
}
public long DeleteLog(string type)
{
long x = dal.DeleteLog(type);
return x;
}
public void SaveShowMesError(string Title, string Remark, string type = "999")
{
ErrorLogBLL logBLL = new ErrorLogBLL();
ErrorLogModel error_model = new ErrorLogModel();
error_model.Type = type;
error_model.Title = Title;
error_model.Remark = Remark;
logBLL.InsertErrorLog(error_model);
}
}
}

118
Epost.BLL/OrderBLL.cs
View File

@ -375,42 +375,11 @@ namespace Epost.BLL
#endregion
#region 修改订单状态
public void UpdateOrderState_Car(List<JobModel> downlist, JobModel model, int truequantity, int checkquaantity = 0)
public void UpdateOrderState_Car(string matchid,string tolocation, string oprationstate)
{
if (downlist.Count > 1)
{
int nowqty = truequantity;
if (truequantity != downlist.Sum(m => m.Quantity))
{
foreach (JobModel jobmo in downlist.ToArray())
{
if (nowqty > jobmo.Quantity)
{
nowqty = nowqty - jobmo.Quantity;
dal.UpdateWorkState_Car(jobmo.Matchid, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
}
else
{
dal.UpdateWorkState_Car(jobmo.Matchid, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
nowqty = 0;
}
}
}
else
{
foreach (JobModel jobmo in downlist.ToArray())
{
dal.UpdateWorkState_Car(jobmo.Matchid, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
dal.UpdateWorkState_Car(matchid, tolocation, oprationstate);
}
}
}
else
{
dal.UpdateWorkState_Car(model.Matchid, truequantity, model.Sku, model.ID, checkquaantity, model.UserCode);
}
}
@ -738,73 +707,33 @@ namespace Epost.BLL
List<JobModel> list = new List<JobModel>();
DataTable OrderDt = dal.GetOrderList_Car(matchid, sku, area, block);
bool isecho = false;
//if (OrderDt == null || OrderDt.Rows.Count == 0)//回显
//{
// OrderDt = dal.GetOrderList_Car(matchid, sku, area, block);
// isecho = true;
//}
if (OrderDt != null && OrderDt.Rows.Count > 0)
{
string usercode = string.Empty;
string lightcolor = string.Empty;
DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
if (udt != null && udt.Rows.Count > 0)
{
usercode = udt.Rows[0]["usercode"].ToString();
lightcolor = udt.Rows[0]["lightcolor"].ToString();
}
if (string.IsNullOrEmpty(lightcolor))
{
lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
}
foreach (DataRow item in OrderDt.Rows)
{
#region 任务缓存信息
JobModel demodel = new JobModel();
demodel.OrderID = item["orderid"].ToString();
demodel.BatchId = item["BatchId"].ToString();
demodel.ID = item["ID"].ToString();
demodel.GoodsName = item["GoodsName"].ToString();
demodel.Quantity = Convert.ToInt32(item["Quantity"].ToString());
demodel.Sku = item["Sku"].ToString();
demodel.Tolocation = item["Tolocation"].ToString();
demodel.Matchid = item["Matchid"].ToString();
demodel.ShopID = item["shopid"].ToString();
demodel.Discount = item["Discount"].ToString();
demodel.Unit = item["Unit"].ToString();
//demodel.TrayCode = item["bkbarcode"].ToString();
demodel.Tolocation = item["fromlocation"].ToString();
demodel.Sku = item["sku"].ToString();
demodel.Matchid = matchid;
demodel.FromTolocation = item["tolocation"].ToString();
demodel.ControlIP = item["ControlIP"].ToString();
demodel.Address = item["Address"].ToString();
#region 获取库位信息
demodel.Block = item["Block"].ToString();
demodel.Area = item["Area"].ToString();
demodel.Address = item["address"].ToString();
demodel.UserCode = usercode;
demodel.ColorCode = lightcolor;
demodel.Bkaddress = "0";
demodel.Addresstype = "1";
demodel.ControlID = "";
demodel.ControlIP = item["ControlIP"].ToString();
//demodel.Layer = item["Layer"].ToString();
//demodel.Slist = item["Slist"].ToString();
//demodel.Zone = item["zone"].ToString();
//demodel.TaskType =Convert.ToInt32(item["tasktype"].ToString());
#endregion
demodel.State = 0;
demodel.TaskArea = Convert.ToInt32(item["area"].ToString());
demodel.TaskBlock = Convert.ToInt32(item["block"].ToString());
demodel.No = "01";
//if (isecho)
//{
// demodel.No = "04";
// demodel.ColorCode = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
//}
list.Add(demodel);
if (!isecho) {
//修改数据为已读
dal.UpOrder_Car(item["Matchid"].ToString(), item["sku"].ToString(), item["id"].ToString());
}
// dal.UpOrder_Car(item["Matchid"].ToString(), item["sku"].ToString(), item["id"].ToString());
UpdateOrderState_Car(matchid, demodel.FromTolocation, "1");
#endregion
}
}
@ -1018,5 +947,26 @@ namespace Epost.BLL
return dal.GetOrderList_echo(matchid, sku, sarea, sblock);
}
#endregion
#region 修改小格口号
public bool UpdateSkuLoc(string sku, string smallloc)
{
return dal.UpdateSkuLoc(sku,smallloc);
}
#endregion
#region 查询小格口是否都已绑定
public bool getSmallLocList(string loc)
{
return dal.getSmallLocList(loc);
}
#endregion
#region 打印箱号 释放格口
public bool CreateBoxInfo(string boxcode, string loc, string type)
{
return dal.CreateBoxInfo(boxcode, loc, type);
}
#endregion
}
}

813
Epost.BLL/OrderControlBLL.cs
View File

@ -1,23 +1,21 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Entity.Infrastructure;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Epost.Common;
using Epost.DAL;
using Epost.DAL.Cache;
using Epost.DAL.Enum;
using Epost.Model;
using Epost.Model.resource;
namespace Epost.BLL
{
public class OrderControlBLL
{
OrdersDAL dal = new OrdersDAL();
OrderBLL orderbll = new OrderBLL();
OrdersQueueBLL queueBLL = new OrdersQueueBLL();
CommandBLL comBLL = new CommandBLL();
@ -31,7 +29,7 @@ namespace Epost.BLL
ShowMesCacheDAL msgCache = new ShowMesCacheDAL();
LocationCacheDAL locCache = new LocationCacheDAL();
BoxCodeCacheDAL boxcache = new BoxCodeCacheDAL();
ErrorLogBLL logBLL = new ErrorLogBLL();
private static object lockobj = new object();
private static object lockJobDown = new object();
@ -44,21 +42,25 @@ namespace Epost.BLL
public ResultModel ClearALL()
{
try
{
bool t = addrBLL.UpdateState();
LogHelper.WriteLogInfo("初始化@@@@@@@@@@@@！----V20230418-1---");
LogHelper.WriteLogInfo("初始化@@@@@@@@@@@@！----V20220705-1---");
JobCache.ClearJobList();
downCacheDAL.ClearJobDownList();
locCache.ClearScanList();
queueBLL.UpdateQueueState();
//queueboxBLL.UpdateQueueState();
// queueboxBLL.UpdateQueueState();
orderbll.UpOrderstate();
UserCacheDAL.ClearUserCodeList();
boxcache.ClearBoxList();
ResultModel resultModel = comBLL.Initialization_M();
//GetOrderQueue(); //加载任务显示器信息
// GetOrderQueue(); //加载任务显示器信息
LogHelper.WriteLogInfo("初始化@@@@@@@@@@@@！----V20200727-1---");
@ -339,56 +341,38 @@ namespace Epost.BLL
skulist = queueDT.Rows[0]["sku"].ToString();
LogHelper.WriteLogInfo("=======" + qmodel.UserCode + "=====" + area + "区===sku=" + skulist);
}
#region 任意回显标签拍下 熄灭回显设备
//if (data.Loc == "check")//任意回显标签拍下 熄灭回显设备
//{
// List<JobModel> rejob = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 1 && m.Sku == queueDT.Rows[0]["sku"].ToString());
// if (rejob.Any())
// {
// JobModel model = rejob.FirstOrDefault();
// comBLL.ClearArea_M(rejob);
// //熄灭通道灯
// comBLL.DISPLAY_LIGHT_BLOCK(block, area, "0");
// // comBLL.UNLOCK_M(rejob);
// #region 修改任务队列状态
// OrdersQueueModel qumodel = new OrdersQueueModel();
// qumodel.State = 3;
// qumodel.Taskblock = block;
// qumodel.Taskarea = area;
// qumodel.Sku = model.Sku;
// qumodel.Matchid = model.Matchid;
// qumodel.UserCode = model.UserCode;
// queueBLL.UpdateQueueTaskArea_Car(qumodel);
// #endregion
// }
// #region 清除当前区已做完的sku
// JobCache.UpdateJobModelList(rejob, EcommendType.Execute);
// #endregion
//}
#endregion
if (data.Result == "4")//■按键拍下
if (data.Loc == "check")//任意回显标签拍下 熄灭回显设备
{
List<JobModel> rejob = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 1 && m.Sku == queueDT.Rows[0]["sku"].ToString());
if (rejob.Any())
{
JobModel model = rejob.FirstOrDefault();
comBLL.ClearArea_M(rejob);
//熄灭通道灯
comBLL.DISPLAY_LIGHT_BLOCK(block, area, "0");
// comBLL.UNLOCK_M(rejob);
#region 修改任务队列状态
OrdersQueueModel qumodel = new OrdersQueueModel();
qumodel.State = 3;
qumodel.Taskblock = block;
qumodel.Taskarea = area;
qumodel.Sku = model.Sku;
qumodel.Matchid = model.Matchid;
qumodel.UserCode = model.UserCode;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
}
#region 清除当前区已做完的sku
JobCache.UpdateJobModelList(rejob, EcommendType.Execute);
#endregion
}
else if (data.Result == "4")//■按键拍下
{
data.Parameter = "0";
jobdown_start(data, job, block, area, jobList);
}
else if (type == "8")//波次完成拍下
{
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == data.Block);
if (ulist.Any())
{
UserCodeModel umodel = ulist.FirstOrDefault();
bool allfinish = dal.IsFinishWorkByCar(1, umodel.Matchid, data.Block);
if (allfinish)
{
//判断整个波次是否已完成
dal.UpdateStateByCar(umodel.Matchid);
List<JobModel> rejob = job.FindAll(m => m.Block == data.Block && m.State == 3);
if (rejob.Any()) { JobCache.UpdateJobModelList(rejob, EcommendType.Execute); }
UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);//删除波次信息
}
}
}
else
{
LogHelper.WriteLogInfo("JOB_DOWN开始~~~~~~~~~~~~~~~~");
@ -398,8 +382,6 @@ namespace Epost.BLL
}
}
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
List<JobModel> rjob = job.FindAll(m => m.Block == data.Block && m.State == 3);
JobCache.UpdateJobModelList(rjob, EcommendType.Execute);
}
#endregion
@ -407,84 +389,109 @@ namespace Epost.BLL
public void jobdown_start(ResultMessageModel data, List<JobModel> job, string block, string area, List<JobModel> jobList)
{
var content = string.Empty;
var color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
int truequantity = 0;
int checkquantity = 0;
string scanstr = data.Parameter;
if (!string.IsNullOrEmpty(scanstr))
{
truequantity = Convert.ToInt32(scanstr);
}
//int truequantity = 0;
//int checkquantity = 0;
//string scanstr = data.Parameter;
//if (!string.IsNullOrEmpty(scanstr))
//{
// truequantity = Convert.ToInt32(scanstr);
//}
//if (job.Any())
//{
// List<JobModel> downlist = new List<JobModel>();
// JobModel model = job.FirstOrDefault();
if (job.Any())
{
List<JobModel> downlist = new List<JobModel>();
JobModel model = job.FirstOrDefault();
downlist.Add(model);
int endcount = 1;
List<JobModel> manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation && m.Sku == model.Sku);
if (manyList.Any())//合并显示数据
{
endcount = manyList.Count;
downlist.AddRange(manyList);
LogHelper.WriteLogInfo("合并显示数据" + endcount + "============================");
}
else
{
downlist.Add(model);
}
// //List<JobModel> manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation);
// //if (manyList.Any())//合并显示数据
// //{
orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity);
LogHelper.WriteLogInfo("6------" + data.Address + "------" + model.Sku + "----" + model.State + "");
bool skuInish = dal.IsFinishWork(1, block, "", area, model.Sku, "", model.Matchid);
if (skuInish)
{
LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter);
#region 修改任务队列状态
OrdersQueueModel qumodel = new OrdersQueueModel();
qumodel.State = 3;
qumodel.Taskblock = block;
qumodel.Taskarea = area;
qumodel.Sku = model.Sku;
qumodel.Matchid = model.Matchid;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
Thread.Sleep(30);
LogHelper.WriteLogInfo("区SKU拣选完成--------------");
//删除sku缓存信息
List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == model.Sku && p.Command == "QUERY_SCAN_STATUS" && p.Area == area);
downCacheDAL.UpdateJobDownModelList(scanlist, EdownCommend.Execute);
List<JobModel> rjob = jobList.FindAll(m => m.Block == data.Block && m.Sku == model.Sku);
JobCache.UpdateJobModelList(rjob, EcommendType.Execute);
// // downlist.AddRange(manyList);
// // LogHelper.WriteLogInfo("合并显示数据=========="+ manyList .Count+ "==================");
// //}
// //else
// //{
// downlist.Add(model);
// // }
// //修改订单状态
// orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity);
// LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter);
// bool skuInish = orderbll.IsFinishWork(1, block, "", area, model.Sku);
// model.State = 3;
// if (skuInish)
// {
// LogHelper.WriteLogInfo("区SKU拣选完成--------------");
// //删除sku缓存信息
// List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == model.Sku && p.Command == "QUERY_SPECIAL_STATUS" && p.Area == area);
// downCacheDAL.UpdateJobDownModelList(scanlist, EdownCommend.Execute);
// //熄灭通道灯
// comBLL.DISPLAY_LIGHT_BLOCK(block, area, "0");
bool allfinish = dal.IsFinishWork_box("", 0, model.Matchid);
if (allfinish)
{
//修改订单状态
orderbll.UpdateOrderState_Car(downlist, model, 1, checkquantity);
bool lbo = dal.UpdateLocation(block, area);
dal.UpdateStateByCar(model.Matchid);
content = "此运单号作业已完成\r\r";
// #region 熄灭当前区显示屏
// List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 3 && m.Sku == model.Sku);
// if (offList.Any())
// {
// comBLL.LED_OFF_CLEAR(offList);
// }
// #endregion
ShowMessageModel_M showmodel = new ShowMessageModel_M();
showmodel.Area = area;
showmodel.Block = block;
showmodel.Color = color;
showmodel.Islock = true;
showmodel.Title = model.Matchid;
showmodel.No = "01";
showmodel.IsTwinkle = 0;
showmodel.Contents = content;
showmodel.Type = 2;
comBLL.ShowBoxMessage_M(showmodel);//点亮显示标签
}
}
}
// #region 修改任务队列状态
// OrdersQueueModel qumodel = new OrdersQueueModel();
// qumodel.State = 3;
// qumodel.Taskblock = block;
// qumodel.Taskarea = area;
// qumodel.Sku = model.Sku;
// qumodel.Matchid = model.Matchid;
// qumodel.UserCode = model.UserCode;
// queueBLL.UpdateQueueTaskArea_Car(qumodel);
// #endregion
//删除已完成的拣选缓存信息
List<JobModel> finjob = JobCache.GetPlanJobList().FindAll(m => m.Block == data.Block && m.Area == data.Area && m.State == 3);
JobCache.UpdateJobModelList(finjob, EcommendType.Execute);
// #region 刷新波次信息
// showSummaryMes(model.Sku, block, area, Convert.ToInt32(block), null, model.Tolocation, model.Matchid);
// #endregion
// Thread.Sleep(30);
// #region 整条通道当前用户所有任务分播结束
// bool blockfinish = orderbll.IsFinishWorkByCar(1, model.Matchid, block);
// if (blockfinish)
// {
// #region 点亮显示器
// ShowMessageModel_M show = new ShowMessageModel_M();
// show.Title = "当前波次分播完成";
// show.Contents = "拍下熄灭所有设备\r请扫描继续作业";
// show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
// show.Qty = "0";
// show.Type = 8;
// show.Block = block;
// show.Islock = false;
// show.IsTwinkle = 1;
// show.No = "01";
// comBLL.ShowBoxMessage_M(show);
// #endregion
// bool allfinish = orderbll.IsFinishWorkByCar(1, model.Matchid);
// if (allfinish)//判断整个波次是否已完成
// { //更新state状态为已完成
// orderbll.UpdateStateByCar(model.Matchid);
// }
// //删除波次信息
// List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == block);
// UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);
// }
// #endregion
// #region 区内sku播完回传
// // orderbll.UpdateStateByCar(model.Matchid, "", model.Sku);
// #endregion
// #region 清除当前区已做完的sku
// JobCache.UpdateJobModelList(offList, EcommendType.Execute);
// #endregion
// }
// }
}
@ -555,55 +562,38 @@ namespace Epost.BLL
#region 点亮任务标签
foreach (JobModel item in nowJoblist.ToArray())
{
if (item.State == 0)
{
List<JobModel> manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation);
int quantity = item.Quantity;
#region 判断同一订单、同一货位多条数据 合并显示
if (manyJoblist.Count > 1)//同一个货位的数据合并显示
{
quantity = 0;
if (manyJoblist.FindAll(m => m.State == 0).Any())
{
foreach (JobModel mitem in manyJoblist)
{
quantity += mitem.Quantity;
mitem.State = 1;
mitem.ManyState = 1;
}
}
}
#endregion
LabelParamModel lamodel = new LabelParamModel();
string address = item.Address.ToString();
lamodel.Address = address;
lamodel.ControlIP = item.ControlIP.ToString();
lamodel.Command = "DISPLAY_JOB";
lamodel.Uid = item.ID;
lamodel.Type = "N";
lamodel.Quantity = quantity.ToString();
lamodel.Uid = item.ID;
lamodel.Mode = queueDT.Rows[0]["lightcolor"].ToString() + "0";
list.Add(lamodel);
item.State = 1;
item.ColorCode = queueDT.Rows[0]["lightcolor"].ToString();
item.DisplayTime = DateTime.Now;
#region 点亮灯带格口
//先熄灭
//comBLL.Ledonoff_dengdai("0", "");
//Thread.Sleep(100);
//comBLL.display_dengdai(item.Tolocation, "2");
comBLL.LED_OFF_CLEAR(item.ControlIP);
Thread.Sleep(100);
LabelParamModel lamodel = new LabelParamModel();
lamodel.Address = item.Address;
lamodel.ControlIP = item.ControlIP;
lamodel.Parameter = "40000001";
comBLL.LED_ON_M(lamodel);
#endregion
item.State = 3;
item.DisplayTime = DateTime.Now;
#region 更新订单状态
orderbll.UpdateOrderState_Car(item.Matchid, item.FromTolocation, "3");
model.State = 3;
bool allfinish = orderbll.IsFinishWorkByCar(1, item.Matchid);
if (allfinish)//判断整个波次是否已完成
{ //更新state状态为已完成
// orderbll.UpdateStateByCar(item.Matchid);
// comBLL.Ledonoff_dengdai("0", "");
//删除波次信息
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList();
UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);
}
#endregion
#region 点亮通道灯
//comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1");
#endregion
#endregion
}
if (list != null && list.Count > 0)
{
LogHelper.WriteLogInfo("添加到点亮的list————————————————————：" + list.Count);
comBLL.DISPLAY_JOBALL(list);
}
#endregion
}
else
{//无任务
@ -611,25 +601,17 @@ namespace Epost.BLL
model.State = 3;
}
#endregion
if (jobList.Any())
{
queueBLL.UpdateQueueOrderState(model);//缓存队列状态修改
}
else
{
var finishList = jobList.FindAll(p => p.State == 0);
if (!finishList.Any())
{
queueBLL.UpdateQueueOrderState(model);//缓存队列状态修改
}
LogHelper.WriteLogInfo("还有未完成任务" + isJobList.Count);
foreach (JobModel item in isJobList)
{
LogHelper.WriteLogInfo("还有未完成任务" + item.Address + item.ID);
}
}
//else
//{
// LogHelper.WriteLogInfo("还有未完成任务" + isJobList.Count);
// foreach (JobModel item in isJobList)
// {
// LogHelper.WriteLogInfo("还有未完成任务" + item.Address + item.ID);
// }
//}
}
#endregion
@ -647,196 +629,44 @@ namespace Epost.BLL
string matchid = string.Empty;
#region 提示请扫描波次号
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);//
bool isnum = ConvertHexHelper.IsNum(scanStr.Substring(0, 1));//判断扫描首字母是否是数字
bool isnum = true;//ConvertHexHelper.IsNum(scanStr.Substring(0, 1));//判断扫描首字母是否是数字
if (!ulist.Any())
{
//手动加波次信息
DataTable matdt = orderbll.GetMatchOrderList();
if (matdt != null && matdt.Rows.Count > 0)
if (scanStr.Substring(0, 1) == "S"&&scanStr.Length==3) //扫描分播墙号
{
UserCodeModel umodel = new UserCodeModel();
umodel.Matchid = matdt.Rows[0]["matchid"].ToString();
umodel.Matchid = data.Parameter;//分播墙号
matchid = data.Parameter;
umodel.Block = sblock;
umodel.Area = sarea;
UserCacheDAL.UpdateUserCodeList(new List<UserCodeModel> { umodel }, EUserCommend.Create);
}
}
ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);
if (ulist.Any())
{ matchid = ulist.FirstOrDefault().Matchid; }
#endregion
if (data.Type == "5")//中分扫描枪
{
//zhongfenBind(ulist, scanStr, data);
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
else if (data.Type == "6")//播种扫描枪
{
var color = EnumHelper.EMToDescriptionString(LightColor.Color.Black);
var i = 0;
var content = string.Empty;
var d = false;
if (scanStr == "Finish")
{
dal.UpBkAddresss(data.Block, data.Area);
DataTable Mdt = dal.GetOrderMatchidInfo(data.Block, data.Area);
if (Mdt != null && Mdt.Rows.Count > 0)
{
LogHelper.WriteLogInfo("----开始强制结束----运单号：" + Mdt.Rows[0]["matchid"].ToString() + "");
dal.UpOrdersMatchid(data.Block, data.Area, Mdt.Rows[0]["matchid"].ToString());
dal.UpOrdersqueue(data.Block, data.Area, Mdt.Rows[0]["matchid"].ToString());
LabelParamModel model = new LabelParamModel();
model.Address = "9999";
model.ControlIP = Mdt.Rows[0]["ControlIP"].ToString();
model.Parameter = "01";
comBLL.REMOVE_JOB(model);
comBLL.LED_OFF_CLEAR(Mdt.Rows[0]["ControlIP"].ToString());
color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
scanStr = "强制结束成功";
content = "运单号:" + Mdt.Rows[0]["matchid"].ToString() + "\r\r";
}
else
{
LogHelper.WriteLogInfo("----开始强制结束----无任务");
scanStr = "当前无任务";
}
LogHelper.WriteLogInfo("扫描播种墙号" + data.Parameter);
logBLL.SaveShowMesError("请扫描物料开始分播", "请扫描物料开始分播");
}
else
{
DataTable ifdt = dal.GetOrdersMatchidIf(scanStr);//判断扫描的是否为运单号
if (ifdt != null && ifdt.Rows.Count > 0)
{
DataTable bindt = dal.GetOrderMatchidBin(scanStr);
if (bindt == null || bindt.Rows.Count <= 0)
{
DataTable IFmatchid = dal.GetOrderMatchidLocation(data.Block, data.Area);
if (IFmatchid != null && IFmatchid.Rows.Count > 0)
{
LogHelper.WriteLogInfo("----------该运单号正在作业：" + IFmatchid.Rows[0]["matchid"].ToString() + "");
scanStr = "当前运单:" + scanStr + "";
content = "当前线路正在作业请勿扫描\r\r";
}
else
{
//循环为运单号分配货位
DataTable noadddt = dal.GetAddressNolocation(data.Block, data.Area);
foreach (DataRow item in ifdt.Rows)
{
if (noadddt.Rows.Count > i)
{
d = dal.UpOrderstolocation(item["shopid"].ToString(), noadddt.Rows[i]["location"].ToString(), scanStr);
}
i++;
}
if (d == true)
{
DataTable dtmt = dal.GetOrderinfoNumber(scanStr);
content = "车牌：" + dtmt.Rows[0]["clientname"].ToString() + "\r门店数：" + dtmt.Rows[0]["shopcount"].ToString() + "\r商品总数：" + dtmt.Rows[0]["qty"].ToString() + "";
}
}
}
else
{
LogHelper.WriteLogInfo("----------该运单号已绑定：" + scanStr + "");
scanStr = "当前运单:" + scanStr + "";
content = "该运单已绑定请勿重复扫描\r\r";
}
}
else
{
DataTable skutb = dal.GetSku(scanStr);
DataTable OrderDt = dal.GetOrderList_Car("", scanStr, data.Area, data.Block);
if (OrderDt != null && OrderDt.Rows.Count > 0)
{
DataTable dd = dal.getQueueState(data.Block, data.Area, "3");
if (dd != null && dd.Rows.Count > 0)
{
content = "商品条码:" + skutb.Rows[0]["sku"].ToString() + "\r名称:" + skutb.Rows[0]["name"].ToString() + "\r";
scanStr = "该商品正在作业" + dd.Rows[0]["Sku"].ToString() + ",请勿扫描";
LogHelper.WriteLogInfo("该商品正在作业---sku：" + dd.Rows[0]["Sku"].ToString() + "");
}
else
{
comBLL.LED_OFF_CLEAR(OrderDt.Rows[0]["controlip"].ToString());
OrdersQueueModel qmodel = new OrdersQueueModel();
qmodel.Taskblock = data.Block;
qmodel.Taskarea = data.Area;
qmodel.Matchid = OrderDt.Rows[0]["Matchid"].ToString();
qmodel.Sku = scanStr;
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
queueBLL.insertQueueOrders(qmodel);
#region 扫描sku点亮显示标签
DataTable dt = dal.GetSkuQuantity(scanStr, OrderDt.Rows[0]["Matchid"].ToString());
var sumqty = dt.Rows[0]["sumqty"].ToString();
string sizeinfo = string.Empty;
if (skutb != null)
{
double bigqty = 0, midqty = 0, lastqty = 0;
double bigsize = 0, midsize = 0;
if (skutb.Rows.Count > 0)
{
bigsize = Convert.ToDouble(skutb.Rows[0]["plumn"].ToString());// 6
midsize = Convert.ToDouble(skutb.Rows[0]["spec"].ToString());// 1
if (bigsize != 0)
{
bigqty = (int)Math.Floor(Convert.ToDouble(sumqty) / bigsize);
sumqty = (Convert.ToDouble(sumqty) - (bigqty * bigsize)).ToString();
}
if (midsize != 0)
{
midqty = (int)Math.Floor(Convert.ToDouble(sumqty) / midsize);
sumqty = (Convert.ToDouble(sumqty) - (midqty * midsize)).ToString();
}
sizeinfo = "筐数:" + bigqty + "包数:" + midqty;
}
else
{
sizeinfo = "总数：" + sumqty;
}
content = "名称:" + skutb.Rows[0]["name"].ToString() + "\r " + sizeinfo + " \r";
}
#endregion
scanStr = "当前商品:" + scanStr + "";
}
}
else
{
if (skutb != null && skutb.Rows.Count > 0)
{
content = "名称：" + skutb.Rows[0]["name"].ToString() + "\r\r";
}
scanStr = "条码：" + scanStr + ",无任务";
LogHelper.WriteLogInfo("该条码无任务---条码：" + scanStr + "");
}
}
LogHelper.WriteLogInfo(scanStr + "请扫描正确的播种墙号");
logBLL.SaveShowMesError("请扫描正确的播种墙号", "请扫描正确的播种墙号");
}
ShowMessageModel_M showmodel = new ShowMessageModel_M();
showmodel.Area = data.Area;
showmodel.Block = data.Block;
showmodel.Color = color;
showmodel.Islock = true;
showmodel.Title = scanStr;
showmodel.IsTwinkle = 0;
showmodel.Contents = content;
showmodel.Type = 2;
comBLL.ShowBoxMessage_M(showmodel);//点亮显示标签
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
else
{
ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);
if (ulist.Any())
{ matchid = ulist.FirstOrDefault().Matchid; }
#endregion
if (data.Type == "6")//播种扫描枪
{
xifenBind(ulist, scanStr, data, matchid, isnum);
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
}
return res;
}
catch (Exception ex)
@ -972,200 +802,155 @@ namespace Epost.BLL
#region 细分播种
public void xifenBind(List<UserCodeModel> ulist, string scanStr, ResultMessageModel data, string matchid, bool isnum)
{
//if (ulist.Any())
//{
// UserCodeModel usermodel = ulist.FirstOrDefault();
//if (string.IsNullOrEmpty(usermodel.UserCode) && scanStr.Substring(0, 1) != "U")//
//{
// #region 提示先扫描工号
// ShowMessageModel_M show = new ShowMessageModel_M();
// show.Title = "请先扫描工号！";
// show.Contents = "";
// show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
// show.Block = sblock;
// show.Area = sarea;
// show.Type = 8;
// show.Islock = true;
// comBLL.ShowBoxMessage_M(show);
// downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
// #endregion
//}
//else
//{
if (scanStr.Substring(0, 1) == "U")
if (ulist.Any())
{
#region 扫描工号
if (ulist.Any())
UserCodeModel umodel = ulist.FirstOrDefault();
if (scanStr.Substring(0, 1) == "U")
{
UserCodeModel umodel = ulist.FirstOrDefault();
umodel.UserCode = scanStr;
#region 扫描工号
ShowMessageModel_M show = new ShowMessageModel_M();
show.Title = "请扫描sku开始作业！";
show.Contents = "";
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
show.Block = data.Block;
show.Area = data.Area;
show.Type = 8;
show.Islock = true;
comBLL.ShowBoxMessage_M(show);
umodel.UserCode = scanStr;
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
#endregion
}
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
#endregion
}
else
{
#region 扫描商品
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888");
if (hangList.Any())
else if (scanStr.Substring(0, 1) == "S" && scanStr.Length == 3) //扫描分播墙号
{
#region 挂起
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block);
LabelParamModel FORMATEModel = new LabelParamModel();
FORMATEModel.ControlIP = data.IP;
comBLL.FORMATE_JOB_DATA(FORMATEModel);
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1");
if (qdt != null && qdt.Rows.Count > 0)
{
scanStr = qdt.Rows[0]["sku"].ToString();
// data.Parameter = scanStr;
Hangup_SKU(scanStr, data.Block, data.Area);
//删除sku对应缓存
List<ResultMessageModel> sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr || p.Parameter == qdt.Rows[0]["location"].ToString());
downCacheDAL.UpdateJobDownModelList(sdown, EdownCommend.Execute);
}
downCacheDAL.UpdateJobDownModelList(hangList, EdownCommend.Execute);
//刷新波次
GetMatchOrder();
#endregion
umodel.Matchid = scanStr;
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
else if (isnum)//sku
else
{
#region 扫描SKU
//根据扫描商品内码获取商品码
data.ScanCode = data.Parameter;
DataTable sinfodt = skuBLL.GetSkuInfoList(data.Parameter);
string location = string.Empty;
if (sinfodt != null && sinfodt.Rows.Count > 0)
{
scanStr = sinfodt.Rows[0]["sku"].ToString();
location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
}
data.Parameter = scanStr;
DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "3");
List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Address == data.Address && m.Parameter == scanStr && m.Parameter != "888888" && m.Block == data.Block && m.Area == data.Area);
if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0))
{ //重复扫描
//ShowMessageModel_M show = new ShowMessageModel_M();
//show.Title = scanStr + "重复扫描/已拣配！";
//show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
//show.Block = sblock;
//show.Area = sarea;
//show.Type = 8;
//comBLL.ShowBoxMessage_M(show);
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
else
#region 扫描商品
List<ResultMessageModel> hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888");
if (hangList.Any())
{
DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block);
if (OrderDt != null && OrderDt.Rows.Count > 0)
#region 挂起
LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block);
LabelParamModel FORMATEModel = new LabelParamModel();
FORMATEModel.ControlIP = data.IP;
comBLL.FORMATE_JOB_DATA(FORMATEModel);
DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1");
if (qdt != null && qdt.Rows.Count > 0)
{
scanStr = qdt.Rows[0]["sku"].ToString();
if (ulist.Any())
// data.Parameter = scanStr;
Hangup_SKU(scanStr, data.Block, data.Area);
//删除sku对应缓存
List<ResultMessageModel> sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr || p.Parameter == qdt.Rows[0]["location"].ToString());
downCacheDAL.UpdateJobDownModelList(sdown, EdownCommend.Execute);
}
downCacheDAL.UpdateJobDownModelList(hangList, EdownCommend.Execute);
//刷新波次
GetMatchOrder();
#endregion
}
else if (isnum)//sku
{
if (data.Parameter.Length <= 2)
{
#region 扫描小格口号
DataTable quedt = queueBLL.getQueueList();
if (quedt != null && quedt.Rows.Count > 0)
{
UserCodeModel umodel = ulist.FirstOrDefault();
data.Port = OrderDt.Rows[0]["matchid"].ToString();
OrdersQueueModel qmodel = new OrdersQueueModel();
qmodel.Sku = scanStr;
qmodel.Taskblock = data.Block;
qmodel.Taskarea = data.Area;
qmodel.UserCode = umodel.UserCode;
qmodel.Matchid = umodel.Matchid;
qmodel.Location = location;
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
queueBLL.insertQueueOrders(qmodel);
//提示需要拣货总量/商品名称
showSummaryMes(scanStr, data.Block, data.Area, 1, data, "", OrderDt.Rows[0]["matchid"].ToString());
LogHelper.WriteLogInfo(quedt.Rows[0]["sku"].ToString() + "绑定小格口" + data.Parameter);
//更新订单记录
orderbll.UpdateSkuLoc(quedt.Rows[0]["sku"].ToString(), data.Parameter);
}
else
{
LogHelper.WriteLogInfo("没有可绑定物料" + data.Parameter);
}
#endregion
}
else if (data.Parameter.Length > 2 && data.Parameter.Length <= 5)
{
LogHelper.WriteLogInfo("扫描满箱");
FinshLoc(data.Parameter);
}
else
{
#region 扫描SKU
//根据扫描商品内码获取商品码
data.ScanCode = data.Parameter;
DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "3");
List<ResultMessageModel> scanlist = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Address == data.Address && m.Parameter == scanStr && m.Parameter != "888888" && m.Block == data.Block && m.Area == data.Area);
if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0))
{
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
else
{
LogHelper.WriteLogInfo("未扫描波次信息", LogHelper.Log_Type.ERROR);
}
}
else
{
#region 回显
DataTable echoDt = orderbll.GetOrderList_echo(matchid, scanStr, data.Area, data.Block);
if (echoDt != null && echoDt.Rows.Count > 0)
{
if (ulist.Any())
DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block);
if (OrderDt != null && OrderDt.Rows.Count > 0)
{
UserCodeModel umodel = ulist.FirstOrDefault();
data.Port = echoDt.Rows[0]["matchid"].ToString();
OrdersQueueModel qmodel = new OrdersQueueModel();
qmodel.Sku = scanStr;
qmodel.Taskblock = data.Block;
qmodel.Taskarea = data.Area;
qmodel.UserCode = umodel.UserCode;
qmodel.Matchid = umodel.Matchid;
// qmodel.Location = location;
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
qmodel.Location = scanStr;
qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
queueBLL.insertQueueOrders(qmodel);
//提示需要拣货总量/商品名称
Mes_Echo(scanStr, data.Block, data.Area, 1, data, "", echoDt.Rows[0]["matchid"].ToString(), false);
}
else
{
LogHelper.WriteLogInfo("未扫描波次信息", LogHelper.Log_Type.ERROR);
logBLL.SaveShowMesError("扫描：" + scanStr + "无任务！", "扫描：" + scanStr + "无任务！");
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
}
else
{
//提示无任务
ShowMessageModel_M show = new ShowMessageModel_M();
show.Title = "商品：" + scanStr + "当前区无任务！";
show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
show.Block = data.Block;
show.Area = data.Area;
show.Type = 8;
show.Islock = false;
comBLL.ShowBoxMessage_M(show);
downCacheDAL.UpdateJobDownModelList(new List<ResultMessageModel> { data }, EdownCommend.Execute);
}
#endregion
}
}
#endregion
}
}
}
#endregion
#region 满箱打印标签
public bool FinshLoc(string loc)
{
bool isfin = orderbll.getSmallLocList(loc);
if (isfin)
{
DataTable locdt= addrBLL.GetALLList(" and location='"+loc+"'");
string type = string.Empty;
if (locdt != null && locdt.Rows.Count > 0)
{
type = locdt.Rows[0]["addresstype"].ToString();
}
#endregion
//生成唯一箱号条码
string boxcode = ((DateTime.Now.ToUniversalTime().Ticks - 621355968000000000) / 10000000).ToString() + loc;
LogHelper.WriteLogInfo(boxcode.ToString());
bool bo = orderbll.CreateBoxInfo(boxcode, loc, type);
return bo;
}
else
{
logBLL.SaveShowMesError("小格口未完全绑定", "小格口未完全绑定，请绑定后再释放！");
return false;
}
}
#endregion
#region 复核显示

11
Epost.BLL/OrdersQueueBLL.cs
View File

@ -222,7 +222,7 @@ namespace Epost.BLL
public bool UpdateQueueState()
{
BoxPickBLL bll = new BoxPickBLL();
//dal.deleteBoxpick();
dal.deleteBoxpick();
bool bo= dal.UpdateQueueState();
//if (bo)
//{
@ -246,5 +246,14 @@ namespace Epost.BLL
}
#endregion
#region 获取最新一条记录
public DataTable getQueueList()
{
return dal.getQueueList();
}
#endregion
}
}

25
Epost.DAL/AddressstorageDAL.cs
View File

@ -165,7 +165,7 @@ namespace Epost.DAL
{
strwhere = " and area='"+area+"'";
}
string sql = string.Format("select address,bkaddress,state,type,area,way,shelfid,ControlID,location,layer,slist,block,addresstype,ControlIP,ControlType,info from V_address where type='{1}' and block='{0}' " + strwhere,
string sql = string.Format("select address, bkaddress, state, type, area ,way ,shelfid, ControlID ,location ,layer, slist, block, addresstype, ControlIP, ControlType, info from V_address where type='{1}' and block='{0}' " + strwhere,
block,
type);
@ -696,7 +696,7 @@ namespace Epost.DAL
#region 获取所有地址列表
public DataTable GetALLList(string strwhere)
{
string sql = string.Format("select * from v_address where 1=1 " + strwhere + " ");
string sql = string.Format("select * from addressstorage where 1=1 " + strwhere + " ");
DataTable dt = db.GetsqlForDT(sql);
return dt;
@ -809,5 +809,26 @@ namespace Epost.DAL
}
#endregion
#region 灯带
#region 查询设备信息
public DataTable QueryAddrList(string strwhere)
{
string sql = string.Format("select * from v_address where 1=1 " + strwhere);
return db.GetsqlForDT(sql);
}
#endregion
#region 查询设备信息
public DataTable QueryControlList(string strwhere)
{
string sql = string.Format(" select distinct controlip ,port,address from v_address where type<>6 " + strwhere);
return db.GetsqlForDT(sql);
}
#endregion
#endregion
}
}

99
Epost.DAL/Cache/LightControlCacheDAL.cs Normal file
View File

@ -0,0 +1,99 @@
using LightContrl;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Epost.DAL.Cache
{
public class LightControlCacheDAL
{
private static object lockconobj = new object();
public static List<LightcontrolModel> MainControlList = new List<LightcontrolModel>();//
#region 获取计划任务列表
public List<LightcontrolModel> GetControlList()
{
return MainControlList;
}
#endregion
#region 初始化任务列表
public void ClearControlList()
{
foreach (var planitem in MainControlList.ToArray())
{
MainControlList.Remove(planitem);
}
}
#endregion
#region Job缓存处理方法
/// <summary>
/// Job缓存处理方法
/// </summary>
/// <param name="JobParam"></param>
/// <param name="ECommend"></param>
/// <returns></returns>
public bool UpdateControlList(List<LightcontrolModel> JobParam, EcontrolCommend CommendType)
{
lock (lockconobj)
{
if (CommendType.Equals(EcontrolCommend.Create))
{
MainControlList.AddRange(JobParam);
}
else if (CommendType.Equals(EcontrolCommend.Execute))
{
foreach (var planitem in MainControlList.ToArray())
{
MainControlList.Remove(planitem);
}
}
return true;
}
}
#endregion
}
public enum EcontrolCommend
{
/// <summary>
/// 创建
/// </summary>
[Description("创建")]
Create,
/// <summary>
/// 删除
/// </summary>
[Description("删除")]
Execute
}
public class LightcontrolModel
{
private string _controlip = string.Empty;
private int _port ;
MainControl _maincontrol = new MainControl();
public MainControl maincontrol { get => _maincontrol; set => _maincontrol = value; }
public string controlip { get => _controlip; set => _controlip = value; }
public int port { get => _port; set => _port = value; }
}
}

12
Epost.DAL/CommandDAL.cs
View File

@ -317,7 +317,7 @@ namespace Epost.DAL
{
var sdlist = alllist.FirstOrDefault(x => x.Key == item["ControlIP"].ToString());
HttpHelper http = new HttpHelper();
string ControlIP = "http://" + item["ControlIP"].ToString() + ":8000/param/";
string ControlIP = "http://" + item["ControlIP"].ToString() + ":81/cgi-bin/rpc.cgi";
// LogHelper.WriteLogInfo(ControlIP + "***************");
string result = "";
List<SendParamModel> list = new List<SendParamModel>();
@ -363,7 +363,7 @@ namespace Epost.DAL
foreach (ResultsModel res in resultModel)
{
if (res.Status == "ERROR")
if (res.Status == "ERROR"&&res.Command!= "START_POLLING")
{
LogHelper.WriteLogInfo("初始化指令" + postStr);
rest.result = "-1";
@ -572,7 +572,7 @@ namespace Epost.DAL
{
ResultsModel resultModel = new ResultsModel();
HttpHelper http = new HttpHelper();
string ControlIP = "http://" + model.ControlIP + ":8000/param/";
string ControlIP = "http://" + model.ControlIP + ":81/cgi-bin/rpc.cgi";
string result = "";
SendParamModel sendModel = new SendParamModel();
sendModel.Address = model.Address;
@ -627,7 +627,7 @@ namespace Epost.DAL
{
var sdlist = alllist.FirstOrDefault(x => x.Key == item["ControlIP"].ToString());
HttpHelper http = new HttpHelper();
string ControlIP = "http://" + item["ControlIP"].ToString() + ":8000/param/";
string ControlIP = "http://" + item["ControlIP"].ToString() + ":81/cgi-bin/rpc.cgi";
// LogHelper.WriteLogInfo(ControlIP + "***************");
string result = "";
List<SendParamModel> list = new List<SendParamModel>();
@ -671,8 +671,8 @@ namespace Epost.DAL
LogHelper.WriteLogInfo("点亮指令" + postStr);
ErrorLogDAL errdal = new ErrorLogDAL();
ErrorLogModel errmodel = new ErrorLogModel();
errmodel.Address = res.Address;
errmodel.ControlIP = item["ControlIP"].ToString();
errmodel.Remark = res.Address;
errmodel.Title = item["ControlIP"].ToString();
//if (res.Parameter.Contains("E16"))
//{

5
Epost.DAL/Epost.DAL.csproj
View File

@ -82,6 +82,10 @@
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="LightContrl, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\LightContrl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
@ -106,6 +110,7 @@
<Compile Include="Cache\EPlightCacheDAL.cs" />
<Compile Include="Cache\JobDownCacheDAL.cs" />
<Compile Include="Cache\JobModelCacheDAL.cs" />
<Compile Include="Cache\LightControlCacheDAL.cs" />
<Compile Include="Cache\LocationCacheDAL.cs" />
<Compile Include="Cache\ScanModelCacheDAL.cs" />
<Compile Include="Cache\ShowMesCacheDAL.cs" />

32
Epost.DAL/ErrorLogDAL.cs
View File

@ -10,24 +10,21 @@ using static Epost.DAL.Enum.SqlLogType;
namespace Epost.DAL
{
public class ErrorLogDAL
public class ErrorLogDAL
{
DataBaseOpration.OprationSqlDAL db = DB_DLL.GetInstance();
DataBaseOpration.OprationSqlDAL db = DB_DLL.GetInstance();
#region 添加日志
public bool InsertErrorLog(ErrorLogModel model)
{
try
{
string sql = string.Format("insert into errorlog(username,ControlIP,ControlID,Address,ErrorDate,Type,BkAddress,Remark) values('{0}','{1}','{2}','{3}','{4}',{5},'{6}','{7}')",
string sql = string.Format("insert into errorlog(username,ErrorDate,Type,title,Remark) values('{0}','{1}','{2}','{3}','{4}')",
model.UserName,
model.ControlIP,
model.ControlID,
model.Address,
DateTime.Now.ToString(),
model.Type,
model.BkAddress,
model.Title,
model.Remark);
int x = db.InsertSql(sql);
if (x > 0)
@ -84,7 +81,7 @@ namespace Epost.DAL
}
else
{
strSql.Append("order by Id asc");
strSql.Append("order by Id desc");
}
strSql.Append(")AS Row, T.* from ErrorLog T WITH(NOLOCK) ");
if (!string.IsNullOrEmpty(strWhere.Trim()))
@ -114,10 +111,25 @@ namespace Epost.DAL
{
LogHelper.WriteLog(GetType(), ex.Message);
recordCount = 0;
return new List<Model.ErrorLogModel>();
return new List<ErrorLogModel>();
}
}
#endregion
public long DeleteLog(string type)
{
string strwhere = string.Empty;
if (!string.IsNullOrEmpty(type))
{
strwhere = " and type ='" + type + "'";
}
string sql = string.Format("delete from errorlog where 1=1 " + strwhere + "");
return db.DeleteSql(sql);
}
}
}

461
Epost.DAL/OrdersDAL.cs
View File

@ -48,7 +48,7 @@ namespace Epost.DAL
string sql = string.Empty;
if (!string.IsNullOrEmpty(area))
{
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, address, ControlIP,area, block,unit,shopid from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + "",
sql = string.Format("select distinct tolocation,fromlocation,sku,block,area,address,controlip from v_orders where state = 0 and oprationstate <>3 and (sku = '{0}' or tolocation='{0}') and block = '{1}' and area='{2}' " + strwhere + "",
sku,
block, area);
@ -56,7 +56,7 @@ namespace Epost.DAL
}
else
{
sql = string.Format("select id, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, address, ControlIP, area , block,unit,shopid from v_orders where state = 0 and oprationstate <>3 and sku = '{0}' and block = '{1}' " + strwhere + "",
sql = string.Format("select distinct tolocation,fromlocation,block,area ,address,controlip from v_orders where state = 0 and oprationstate <>3 (and sku = '{0}'or tolocation='{0}') and block = '{1}' " + strwhere + "",
sku,
block);
@ -90,7 +90,7 @@ namespace Epost.DAL
string sql = string.Empty;
if (!string.IsNullOrEmpty(area))
{
sql = string.Format("select id,Matchid,orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, address, ControlIP,area, block,bkbarcode,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + "",
sql = string.Format("select id,ProdArea, LotNo, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, GoodsType, corlorcode, address, ControlIP,area, block,boxcode,bkbarcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' and area='{2}' " + strwhere + "",
sku,
block, area);
@ -98,7 +98,7 @@ namespace Epost.DAL
}
else
{
sql = string.Format("select id,Matchid,orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, address, ControlIP, area , block,bkbarcode,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' " + strwhere + "",
sql = string.Format("select id,ProdArea, LotNo, Matchid, orderid, barcode, BatchId, DownDate, Tolocation, Sku, GoodsName, Discount, Quantity, GoodsType, corlorcode, address, ControlIP, area , block,boxcode,bkbarcode,isnull(checkquantity,0) as checkquantity,wholeunit,unit,shopid,wmsboxcode from v_orders where state = 0 and sku = '{0}' and block = '{1}' " + strwhere + "",
sku,
block);
@ -622,41 +622,19 @@ namespace Epost.DAL
#endregion
#region 修改当前标签拣货状态
public bool UpdateWorkState_Car(string matchid, int truequantity, string sku, string id, int checkquantity, string usercode = "")
public bool UpdateWorkState_Car(string matchid,string tolocation, string oprationstate )
{
try
{
lock (uplock)
{
int oprationstate = 3;
// string sql = string.Format("select quantity,truequantity from orders where matchid='{0}' and sku = '{1}' and batchid='{2}'",
// matchid,
// sku,
// batchid);
//DataTable dt= db.GetsqlForDT(sql);
// if (dt!=null&&dt.Rows.Count > 0)
// {
// int trueqty =Convert.ToInt32( dt.Rows[0]["truequantity"].ToString());
// int quantity =Convert.ToInt32( dt.Rows[0]["quantity"].ToString());
// if (trueqty + 1 == quantity)
// {
// oprationstate = 3;
// }
// truequantity = trueqty + 1;
// }
string upsql = string.Format("update orders set oprationstate = '{3}' ,oprationtime='{0}',oprationcode='{5}',truequantity='{1}' where matchid='{2}' and id='{4}' ",
DateTime.Now.ToString(),
truequantity,
string upsql = string.Format("update orders set oprationstate = '{0}' ,oprationtime='{1}' ,truequantity=quantity where matchid='{2}' and tolocation='{3}' ",
oprationstate,
DateTime.Now.ToString(),
matchid,
oprationstate,
id,
// checkquantity,
usercode
tolocation
);
long x = db.UpdateSql(upsql);
LogHelper.WriteLogInfo("修改当前标签拣货状态:" + upsql + ",成功条数：" + x + "");
if (x > 0)
return true;
return false;
@ -2493,373 +2471,100 @@ namespace Epost.DAL
}
#endregion
#region 三迎
//========三迎========
#region 查询扫描的是否为运单号
public DataTable GetOrdersMatchidIf(string matchid)
{
string sql = string.Format("select distinct matchid,shopid,shopname,prino+0 from Orders where matchid='" + matchid + "' order by prino+0 asc");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
#endregion
#region 查询可分配的货位
public DataTable GetAddressNolocation(string block, string area)
{
string sql = string.Format("select * from Addressstorage where bkaddress='0' and type='1' and block='" + block + "' and area='" + area + "' order by location+1 asc");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
#endregion
#region 为orders分配货位
public bool UpOrderstolocation(string shopid, string tolocation, string matchid)
{
string sql = string.Format("update Orders set tolocation='" + tolocation + "' where shopid='" + shopid + "' and matchid='" + matchid + "'");
long x = db.UpdateSql(sql);
LogHelper.WriteLogInfo("为orders分配货位：" + sql + ",成功条数：" + x + "");
if (x > 0)
{
sql = string.Format("update Addressstorage set bkaddress='" + shopid + "' where location='" + tolocation + "' and bkaddress='0' ");
long b = db.UpdateSql(sql);
LogHelper.WriteLogInfo("更新Addressstorage货位为已占用：" + sql + ",成功条数：" + b + "");
return true;
}
else
{
return false;
}
}
#endregion
#region 查询是否有正在作业的运单号
public DataTable GetOrderMatchidBin(string matchid)
{
string sql = string.Format("select * from v_orders where tolocation!='' and matchid='" + matchid + "' ");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
public DataTable GetOrderMatchidLocation(string block, string area)
{
string sql = string.Format("select * from v_orders where tolocation!='' and block='" + block + "' and area='" + area + "' ");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
public DataTable GetOrderMatchidInfo(string block, string area)
{
string sql = string.Format("select distinct matchid,ControlIP from v_orders where (tolocation!='' or tolocation is not null) and block='" + block + "' and area='" + area + "' ");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
#endregion
#region 强制结束修改状态
public bool UpOrdersMatchid(string block, string area, string matchid)
#region 修改小格口号
public bool UpdateSkuLoc(string sku,string smallloc)
{
try
{
string sql = string.Format("update orders set state='3' where tolocation!='' and matchid='" + matchid + "' ");
string sql = string.Format(" update orders set partcode = '{0}' where sku='{1}' and (partcode is null or partcode='')",
smallloc,
sku);
long x = db.UpdateSql(sql);
LogHelper.WriteLogInfo("强制结束修改状态：" + sql + ",成功条数：" + x + "");
LogHelper.WriteLogInfo(x+"修改小格口信息"+sql);
if (x > 0)
return true;
return false;
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("修改小格口号出错1" + ex.Message);
return false;
}
}
#endregion
#region 查询小格口是否都已绑定
public bool getSmallLocList(string loc)
{
string sql = string.Format("select top 1 * from orders where (partcode is null or partcode='') and oprationstate=3 and fromlocation='{0}'", loc);
DataTable dt = db.GetsqlForDT(sql);
if (dt != null && dt.Rows.Count > 0)
{
return false;
}
else
{
return true;
}
}
#endregion
#region 生成箱号
public bool CreateBoxInfo(string boxcode, string loc, string type)
{
try
{
//添加打印信息
string printsql = string.Format("insert into print_sku(orderid,matchid,state,addtime,type) values('{0}','{1}','{2}','{3}','{4}')",
boxcode, loc, "0", DateTime.Now.ToString(), type);
int x = db.InsertSql(printsql);
if (x > 0)
{
//更新订单状态为已完成
string sql = string.Format("update orders set state =3,boxcode='{0}' where fromlocation='{1}' and state<>3 and oprationstate=3",
boxcode, loc);
long y = db.UpdateSql(sql);
LogHelper.WriteLogInfo(y + "更新订单完成" + sql);
//查询此货位是否存在未播商品
//string querysql = string.Format("select * from orders where oprationstate<>3 and fromlocation='{0}'",loc);
//DataTable querydt = db.GetsqlForDT(querysql);
//if (querydt != null && querydt.Rows.Count > 0)
//{
// LogHelper.WriteLogInfo(loc+"还有商品未分配完，不释放格口");
// //不释放格口
// return true;
//}
//else {
// //释放格口
// string upsql = string.Format("update addressstorage set bkaddress=0,addresstype='' where location='{0}'", loc);
// long b = db.UpdateSql(upsql);
// if (b > 0)
// {
// return true;
// }
// else
// {
// LogHelper.WriteLogInfo("释放格口失败" + upsql);
// return false;
// }
//}
return true;
}
else
{
LogHelper.WriteLogInfo("添加打印箱标签失败" + printsql);
return false;
}
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("强制结束修改状态异常：" + ex + "");
return false;
}
}
public bool UpBkAddresss(string block, string area)
{
string sql = string.Format("update Addressstorage set bkaddress='0' where block='" + block + "' and area='" + area + "' ");
long x = db.UpdateSql(sql);
LogHelper.WriteLogInfo("强制结束修改Addressstorage:" + sql + ",成功条数:" + x + "");
if (x > 0)
{
return true;
}
else
{
return false;
}
}
public bool UpOrdersqueue(string block, string area, string matchid)
{
string sql = string.Format("update ordersqueue set state='3' where Taskblock='" + block + "' and Taskarea='" + area + "' and matchid='" + matchid + "' ");
long x = db.UpdateSql(sql);
LogHelper.WriteLogInfo("强制结束修改ordersqueue:" + sql + ",成功条数:" + x + "");
if (x > 0)
{
return true;
}
else
{
return false;
}
}
#endregion
#region 查询
public DataTable GetSkuQuantity(string sku, string matchid)
{
string sql = string.Format("select sum(quantity) sumqty from Orders where sku='" + sku + "' and matchid='" + matchid + "' ");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
public DataTable GetSku(string sku)
{
string sql = string.Format("select * from SkuInfo where sku = '" + sku + "' ");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
#endregion
#region 释放播种位
public bool UpdateLocation(string block, string area)
{
string sql = string.Format("update Addressstorage set bkaddress='0' where block='" + block + "' and area='" + area + "' and type='1' ");
long x = db.UpdateSql(sql);
LogHelper.WriteLogInfo("运单完成-释放播种位：" + sql + ",条数：" + x + "");
if (x > 0)
{
return true;
}
else
{
return false;
}
}
#endregion
#region MyRegion
public bool UpdateWorkState_DPS(string matchid, int truequantity, string sku, int batchid, int checkquantity, string usercode = "")
{
try
{
lock (uplock)
{
int oprationstate = 3;
string upsql = string.Format("update Orders set oprationstate = '{3}' ,oprationtime='{0}',oprationcode='{5}',truequantity=quantity where matchid='{2}' and id='{4}' ",
DateTime.Now.ToString(),
truequantity,
matchid,
oprationstate,
batchid,
//checkquantity,
usercode
);
LogHelper.WriteLogInfo("-修改orders" + upsql);
long x = db.UpdateSql(upsql);
if (x > 0)
{
return true;
}
else
{
LogHelper.WriteLogInfo("修改orders异常：" + upsql, LogHelper.Log_Type.ERROR);
return false;
}
}
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("修改当前标签拣货状态异常：" + ex.Message);
return false;
}
}
#endregion
#region
public DataTable GetOrderinfoNumber(string matchid)
{
string sql = string.Format("select distinct matchid,clientname,COUNT(distinct shopid) 'shopcount',count(distinct sku) qty from Orders where matchid='" + matchid + "' and isnull(tolocation,0)>0 group by matchid,clientname");
DataTable dt = db.GetsqlForDT(sql);
return dt;
}
#endregion
#region MyRegion
public bool ImportOrderinfo(DataTable ds, Dictionary<string, string> diclist)
{
bool bo = db.UpdateData(ds, "orders", diclist);
if (bo)
{
return true;
}
else
{
LogHelper.WriteLogInfo("添加取消订单失败");
LogHelper.WriteLogInfo("完成格口异常" + ex.ToString());
return false;
}
}
#endregion
#region 数据维护
public bool DelOrderSku()
{
try
{
string sql = string.Format("delete from Orders where sku not in (select sku from SkuInfo) ");
long x = db.DeleteSql(sql);
LogHelper.WriteLogInfo("数据维护：" + sql + ",成功条数:" + x + "");
if (x > 0)
{
return true;
}
else
{
return false;
}
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("数据维护异常：" + ex + "", LogHelper.Log_Type.ERROR);
return false;
}
}
#endregion
#region 导入数据清理之前orders
public void DelOrdersBeforeDate()
{
try
{
string sql = string.Format("insert into Ordershis select * from Orders");
long x = db.InsertSql(sql);
LogHelper.WriteLogInfo("导入数据清理之前orders：" + sql + ",成功条数：" + x + "");
if (x > 0)
{
sql = string.Format("delete from Orders");
x = db.DeleteSql(sql);
LogHelper.WriteLogInfo("清理orders数据：" + sql + ",成功条数:" + x + "");
}
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("导入数据清理之前orders异常：" + ex.Message + "", LogHelper.Log_Type.ERROR);
}
}
#endregion
#region 运单用时
public List<OrdersModel> GetMatchUserTimeByPage(string strWhere, string orderby, int startIndex, int endIndex, out int recordCount)
{
try
{
StringBuilder strSql = new StringBuilder();
strSql.Append("SELECT * FROM ( ");
strSql.Append(" SELECT ROW_NUMBER() OVER (");
if (!string.IsNullOrEmpty(orderby.Trim()))
{
strSql.Append("order by T." + orderby);
}
else
{
strSql.Append("order by matchid asc");
}
strSql.Append(")AS Row,matchid as matchid,clientname as clientname,count(distinct(shopid)) as ShopCount,MIN(CONVERT(datetime,oprationtime)) AS starttime,MAX(CONVERT(datetime,oprationtime)) AS endtime,DATEDIFF(MINUTE,MIN(CONVERT(datetime,oprationtime)),MAX(CONVERT(datetime,oprationtime))) AS UseTime FROM Ordershis where 1=1 " + strWhere + " GROUP BY matchid,clientname ");
strSql.Append(" ) TT");
strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
List<OrdersModel> list = ModelConvertHelper<OrdersModel>.ConvertToList(db.GetsqlForDT(strSql.ToString()));
strSql.Remove(0, strSql.Length);
strSql.Append("SELECT count(distinct matchid) FROM Ordershis");
if (!string.IsNullOrEmpty(strWhere.Trim()))
{
strSql.AppendFormat(" WHERE 1=1 {0}", strWhere);
}
object obj = db.GetsqlForDT(strSql.ToString()).Rows[0][0];
if (obj != null)
recordCount = Convert.ToInt32(obj);
else
recordCount = 0;
return list;
}
catch (Exception ex)
{
LogHelper.WriteLog(GetType(), ex.Message);
recordCount = 0;
return new List<Model.OrdersModel>();
}
}
public DataTable GetMatchUserTime_DT(string strWhere)
{
try
{
string sql = string.Format("SELECT matchid as matchid,clientname as clientname,count(distinct(shopid)) as ShopCount,MIN(CONVERT(datetime,oprationtime)) AS starttime,MAX(CONVERT(datetime,oprationtime)) AS endtime,DATEDIFF(MINUTE,MIN(CONVERT(datetime,oprationtime)),MAX(CONVERT(datetime,oprationtime))) AS UseTime FROM Ordershis where 1=1 " + strWhere + " GROUP BY matchid,clientname ");
return db.GetsqlForDT(sql.ToString());
}
catch (Exception ex)
{
LogHelper.WriteLog(GetType(), ex.Message);
return new DataTable();
}
}
#endregion
#region 获取当前区的作业状态
public DataTable getQueueState(string block, string area, string state)
{
string sql = string.Format("select * from OrdersQueue where taskblock='{0}' and taskarea='{1}' and state!='" + state + "' order by sort",
block,
area);
return db.GetsqlForDT(sql);
}
#endregion
#region 判断订单状态为已完成
public bool IsFinishWork_box(string boxcode, int endcount, string matchid = "")
{
string sql = string.Format("select matchid from Orders where (matchid='{0}') and oprationstate<>3",
matchid);
LogHelper.WriteLogInfo("判断整箱状态为已完成" + sql);
DataTable dt = db.GetsqlForDT(sql);
if (dt == null || dt.Rows.Count == endcount)
{
LogHelper.WriteLogInfo("判断整箱状态为已完成true");
return true;
}
else
{
LogHelper.WriteLogInfo("判断整箱状态为已完成false");
return false;
}
}
#endregion
#endregion
}
}

9
Epost.DAL/OrdersQueueDAL.cs
View File

@ -408,5 +408,14 @@ namespace Epost.DAL
}
#endregion
#region 获取最新一条记录
public DataTable getQueueList()
{
string sql = string.Format("select top 1 * from OrdersQueue where state=3 order by id desc");
return db.GetsqlForDT(sql);
}
#endregion
}
}

62
Epost.Model/ErrorLogModel.cs
View File

@ -6,18 +6,17 @@ using System.Threading.Tasks;
namespace Epost.Model
{
public class ErrorLogModel
public class ErrorLogModel
{
private int _ID ;
private string _ControlIP = string.Empty;
private string _ControlID = string.Empty;
private string _Address = string.Empty;
private int _ID;
private DateTime _ErrorDate;
private string _Type = string.Empty;
private string _BkAddress = string.Empty;
private string _Remark = string.Empty;
private long _Row = 0;
private string _UserName = string.Empty;
private string _Title = string.Empty;
public int _PageIndex = 0;
public int _PageSize = 0;
@ -69,44 +68,7 @@ namespace Epost.Model
_UserName = value;
}
}
public string ControlIP
{
get
{
return _ControlIP;
}
set
{
_ControlIP = value;
}
}
public string ControlID
{
get
{
return _ControlID;
}
set
{
_ControlID = value;
}
}
public string Address
{
get
{
return _Address;
}
set
{
_Address = value;
}
}
public DateTime ErrorDate
{
@ -134,18 +96,6 @@ namespace Epost.Model
}
}
public string BkAddress
{
get
{
return _BkAddress;
}
set
{
_BkAddress = value;
}
}
public string Remark
{
@ -172,5 +122,7 @@ namespace Epost.Model
_ID = value;
}
}
public string Title { get => _Title; set => _Title = value; }
}
}

15
Epost.Model/JobModel.cs
View File

@ -13,6 +13,8 @@ namespace Epost.Model
private string _BatchId = string.Empty;
private string _Tolocation = string.Empty;
private string _FromTolocation = string.Empty;
private string _Sku = string.Empty;
private string _GoodsName = string.Empty;
private string _Discount = string.Empty;//规格
@ -74,6 +76,19 @@ namespace Epost.Model
}
}
public string FromTolocation
{
get
{
return _FromTolocation;
}
set
{
_FromTolocation = value;
}
}
public string Sku
{
get

16
Epost.Model/OrderModel.cs
View File

@ -9,10 +9,18 @@ namespace Epost.Model
public class OrderModel
{
private string _OrderNO = string.Empty;
private string _State = string.Empty;// 1亮灯 0灭灯
private string _wallNo = string.Empty;
private string _location = string.Empty;
private string _lightColor = string.Empty;
private string _lightType = string.Empty;
private string _brightness = string.Empty;
private string _status = string.Empty;
public string OrderNO { get => _OrderNO; set => _OrderNO = value; }
public string State { get => _State; set => _State = value; }
public string wallNo { get => _wallNo; set => _wallNo = value; }
public string lcation { get => _location; set => _location = value; }
public string lightColor { get => _lightColor; set => _lightColor = value; }
public string lightType { get => _lightType; set => _lightType = value; }
public string brightness { get => _brightness; set => _brightness = value; }
public string status { get => _status; set => _status = value; }
}
}

87
Epost.Model/ResultModel.cs
View File

@ -37,4 +37,91 @@ namespace Epost.Model
}
}
}
public class SerResultModel
{
private string _resultCode = string.Empty;
private string _resultMsg = string.Empty;
public string resultCode { get => _resultCode; set => _resultCode = value; }
public string resultMsg { get => _resultMsg; set => _resultMsg = value; }
}
public class TaskReqModel
{
private string matchid = string.Empty;
private string orderid = string.Empty;
private string sku = string.Empty;
private string tolocation = string.Empty;
private string originalBatch = string.Empty;
private string block = string.Empty;
private string area = string.Empty;
private string _id = string.Empty;
public string Matchid { get => matchid; set => matchid = value; }
public string Orderid { get => orderid; set => orderid = value; }
public string Sku { get => sku; set => sku = value; }
public string Tolocation { get => tolocation; set => tolocation = value; }
public string OriginalBatch { get => originalBatch; set => originalBatch = value; }
public string Block { get => block; set => block = value; }
public string Area { get => area; set => area = value; }
public string id { get => _id; set => _id = value; }
}
public class ResultLightModel
{
private string _resultCode = string.Empty;
private string _resultMsg = string.Empty;
public string resultCode
{
get
{
return _resultCode;
}
set
{
_resultCode = value;
}
}
public string resultMsg
{
get
{
return _resultMsg;
}
set
{
_resultMsg = value;
}
}
}
public class reqmodel
{
public string wallNo { get; set; }
public string lightType { get; set; }
public string lightColor { get; set; }
public string status { get; set; }
}
public class DisplayjobModelReq
{
public string wallNo { get; set; }
public string location { get; set; }
public string lightColor { get; set; }
public string lightType { get; set; }
public string brightness { get; set; }
}
}

1
Epost.TestToolsWeb/Controllers/HomeController.cs
View File

@ -42,6 +42,7 @@ namespace Epost.TestToolsWeb.Controllers
{
ViewBag.isClear = isClear;
ViewBag.isWork = isWork;
return View();

358
Epost.TestToolsWeb/Controllers/ServerController.cs
View File

@ -5,46 +5,311 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using LightContrl;
using Epost.DAL.Cache;
using System.Net;
using Microsoft.Owin.BuilderProperties;
namespace Epost.DPS.Controllers
{
[RoutePrefix("api/WebAPI")]
public class ServerController : ApiController
{
AddressstorageBLL addrbll = new AddressstorageBLL();
LightControlCacheDAL cachedal = new LightControlCacheDAL();
private static object lockinit = new object();
OrderControlBLL contrbll = new OrderControlBLL();
//初始化
MainControl lig = new MainControl();
#region 连接
[Route("CONNECT")]
[HttpPost]
public ResultLightModel CONNECT([FromBody] List<reqmodel> data)
{
ResultLightModel res = new ResultLightModel();
try
{
LogHelper.WriteLogInfo("CONNECT请求" + JsonHelper.SerializeObject(data));
if (data.Any() && data.Count > 0)
{
foreach (var item in data)
{
if (item.status == "1")//连接
{
DataTable dt = addrbll.QueryControlList(" ");
if (dt != null && dt.Rows.Count > 0)
{
foreach (DataRow rowitem in dt.Rows)
{
string ipaddress = rowitem["controlip"].ToString().Trim();
List<LightcontrolModel> conlist = cachedal.GetControlList().FindAll(o => o.controlip == ipaddress);
if (conlist != null && conlist.Count > 0)
{
LogHelper.WriteLogInfo(ipaddress + "已连接！");
res.resultCode = "0";
res.resultMsg = "成功！";
return res;
}
else
{
int port = Convert.ToInt32(rowitem["port"].ToString().Trim());
int timeout = 2000;
bool bo = lig.Connect(ipaddress, port, timeout);//timeout 毫秒
if (bo)
{
LightcontrolModel model = new LightcontrolModel();
model.controlip = ipaddress;
model.maincontrol = lig;
model.port = port;
cachedal.UpdateControlList(new List<LightcontrolModel> { model }, EcontrolCommend.Create);
res.resultCode = "0";
res.resultMsg = "成功！";
}
else
{
res.resultCode = "-1";
res.resultMsg = "连接失败" + ipaddress;
LogHelper.WriteLogInfo("连接失败" + ipaddress);
return res;
}
}
}
}
else
{
res.resultCode = "-1";
res.resultMsg = "播种墙号错误";
LogHelper.WriteLogInfo("播种墙号错误");
return res;
}
}
else {
LogHelper.WriteLogInfo("断开连接");
List<LightcontrolModel> conlist = cachedal.GetControlList();
if (conlist.Any() && conlist.Count > 0)
{
foreach (LightcontrolModel con in conlist)
{
bool b= con.maincontrol.DisConnect(con.controlip,con.port);
LogHelper.WriteLogInfo(b+"断开连接"+ con.controlip+"=="+con.port);
}
}
cachedal.ClearControlList();
res.resultCode = "0";
res.resultMsg = "断开连接成功！";
}
}
}
return res;
}
catch (Exception ex)
{
LogHelper.WriteLogInfo(ex.ToString(), LogHelper.Log_Type.ERROR);
res.resultMsg = "请求接口异常！";
res.resultCode = "-1";
}
return res;
}
#endregion
#region 全亮全灭
[Route("LEDON")]
[HttpPost]
public ResultLightModel LEDON([FromBody] List<reqmodel> data)
{
ResultLightModel res = new ResultLightModel();
try
{
LogHelper.WriteLogInfo("LEDON请求" + JsonHelper.SerializeObject(data));
if (data.Any() && data.Count > 0)
{
foreach (var item in data)
{
//根据播种墙号查询灯带IP
DataTable dt = addrbll.QueryControlList(" ");
if (dt != null && dt.Rows.Count > 0)
{
foreach (DataRow rowitem in dt.Rows)
{
string ipaddress = rowitem["controlip"].ToString().Trim();
List<LightcontrolModel> conlist = cachedal.GetControlList().FindAll(o => o.controlip == ipaddress);
if (conlist != null && conlist.Count > 0)
{
MainControl control = conlist.FirstOrDefault().maincontrol;
bool bo = false;
string Address = dt.Rows[0]["address"].ToString().Trim();
string resstr = string.Empty;
if (item.lightType == "0")
{
bo = control.LED_OFF(ipaddress, Address,ref resstr);
}
else
{
bo = control.LED_ON(ipaddress, Address, ref resstr, "3", "0" , item.lightColor.Trim());
}
if (bo)
{
res.resultCode = "0";
res.resultMsg = "成功！";
}
else
{
res.resultCode = "-1";
res.resultMsg = "失败";
LogHelper.WriteLogInfo(ipaddress+"失败!" +resstr);
}
}
else
{
res.resultCode = "-1";
res.resultMsg = "请先连接设备";
LogHelper.WriteLogInfo("请先连接设备!");
}
}
}
else
{
res.resultCode = "-1";
res.resultMsg = "播种墙号错误！";
LogHelper.WriteLogInfo("播种墙号错误", LogHelper.Log_Type.ERROR);
}
}
}
else
{
res.resultCode = "-1";
res.resultMsg = "请求参数错误！";
LogHelper.WriteLogInfo("请求参数错误!");
}
return res;
}
catch (Exception ex)
{
LogHelper.WriteLogInfo(ex.ToString(), LogHelper.Log_Type.ERROR);
res.resultMsg = "请求接口异常！";
res.resultCode = "-1";
}
return res;
}
#endregion
#region 根据货位点亮/熄灭格口
[Route("DISPLAYJOB")]
[HttpPost]
public ResultModel DISPLAYJOB(OrderModel model)
public ResultLightModel DISPLAYJOB([FromBody] List<DisplayjobModelReq> data)
{
lock (lockinit)
ResultLightModel res = new ResultLightModel();
try
{
ResultModel res = new ResultModel();
try
LogHelper.WriteLogInfo("DISPLAYJOB请求" + JsonHelper.SerializeObject(data));
if (data.Any() && data.Count > 0)
{
LogHelper.WriteLogInfo(JsonHelper.SerializeObject(model));
res.result = "0";
res.msg = "成功！";
return res;
foreach (DisplayjobModelReq item in data)
{
//根据播种墙号查询灯带IP
DataTable dt = addrbll.QueryControlList("");
if (dt != null && dt.Rows.Count > 0)
{
foreach (DataRow rowitem in dt.Rows)
{
string ipaddress = rowitem["controlip"].ToString().Trim();
List<LightcontrolModel> conlist = cachedal.GetControlList().FindAll(o => o.controlip == ipaddress);
if (conlist != null && conlist.Count > 0)
{
MainControl control = conlist.FirstOrDefault().maincontrol;
DataTable locdt = addrbll.QueryAddrList(" and location ='" + item.location + "' and controlip='" + ipaddress + "'");
if (locdt != null && locdt.Rows.Count > 0)
{
List<LightParagraph> list = new List<LightParagraph>();
string address = locdt.Rows[0]["address"].ToString().Trim();
foreach (DataRow locitem in locdt.Rows)
{
//根据播种墙号、格口号查询播种墙ip及灯带地址
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("GetDataList异常：" + ex.Message);
res.msg = "请求异常！";
res.result = "-1";
return res;
LightParagraph show = new LightParagraph();
show.WayNu = Convert.ToInt32(locitem["wayno"].ToString().Trim());
show.LightBeganNu = locitem["beginno"].ToString().Trim();
show.LightEndNu = locitem["endno"].ToString().Trim();
show.LightColor = item.lightColor.Trim(); //1:蓝色 2:绿色 3：青色 4:红色 5：紫色 6黄色 7白色
show.Brightness = item.brightness.Trim();//亮度 1-9
list.Add(show);
}
string resstr = string.Empty;
bool bo = control.LED_By_Paragraph(ipaddress, address, list,ref resstr);
if (bo)
{
LogHelper.WriteLogInfo("成功" + ipaddress+"list:"+JsonHelper.SerializeObject(list));
res.resultCode = "0";
res.resultMsg = "成功！";
}
else
{
LogHelper.WriteLogInfo("失败"+ ipaddress + "list:" + JsonHelper.SerializeObject(list),LogHelper.Log_Type.ERROR);
res.resultCode = "-1";
res.resultMsg = resstr;
return res;
}
}
}
else
{
res.resultCode = "-1";
res.resultMsg = "请先连接设备！";
LogHelper.WriteLogInfo("请先连接设备!");
}
}
}
else
{
res.resultCode = "-1";
res.resultMsg = "播种墙号错误！";
LogHelper.WriteLogInfo("播种墙号错误!");
}
}
}
return res;
}
catch (Exception ex)
{
LogHelper.WriteLogInfo(ex.ToString(), LogHelper.Log_Type.ERROR);
res.resultMsg = "请求接口异常！";
res.resultCode = "-1";
}
return res;
}
#endregion
//初始化
[Route("ClearALL")]
[HttpPost]
@ -96,58 +361,6 @@ namespace Epost.DPS.Controllers
return res;
}
}
#region 设备检测
[Route("TestStart")]
[HttpPost]
public ResultModel TestStart()
{
lock (lockinit)
{
ResultModel res = new ResultModel();
try
{
ResultModel result = contrbll.TestStart();
return result;
}
catch (Exception ex)
{
LogHelper.WriteLogInfo("GetDataList异常：" + ex.Message);
res.msg = "请求异常！";
res.result = "-1";
return res;
}
}
}
#endregion
#region 停止检测
[Route("TestEnd")]
[HttpPost]
public ResultModel TestEnd()
{
lock (lockinit)
{
ResultModel res = new ResultModel();
contrbll.TestEnd();
res.msg = "成功！";
res.result = "0";
return res;
}
}
#endregion
#region 停止作业
[Route("EndWork")]
[HttpPost]
@ -163,10 +376,5 @@ namespace Epost.DPS.Controllers
}
}
#endregion
}
}

28
Epost.TestToolsWeb/Epost.DPS.csproj
View File

@ -61,6 +61,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\ExcelIntOut.dll</HintPath>
</Reference>
<Reference Include="LightContrl, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\LightContrl.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AI.Agent.Intercept, Version=1.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.ApplicationInsights.Agent.Intercept.1.2.1\lib\net45\Microsoft.AI.Agent.Intercept.dll</HintPath>
<Private>True</Private>
@ -870,18 +874,6 @@
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Home\Index.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Log\fonts\glyphicons-halflings-regular.woff" />
<Content Include="Log\fonts\glyphicons-halflings-regular.ttf" />
<Content Include="Log\fonts\glyphicons-halflings-regular.eot" />
<Content Include="packages.config" />
<None Include="Project_Readme.html" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="File\" />
<Folder Include="Models\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Epost.Common.csproj">
<Project>{44c36ca3-d672-40d1-ac94-91115de29a2d}</Project>
@ -900,6 +892,18 @@
<Name>Epost.Model</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Log\fonts\glyphicons-halflings-regular.woff" />
<Content Include="Log\fonts\glyphicons-halflings-regular.ttf" />
<Content Include="Log\fonts\glyphicons-halflings-regular.eot" />
<Content Include="packages.config" />
<None Include="Project_Readme.html" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="File\" />
<Folder Include="Models\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

4
Epost.TestToolsWeb/Epost.DPS.csproj.user
View File

@ -10,8 +10,8 @@
<WebStackScaffolding_LayoutPageFile>~/Views/Shared/_EpostLayoutPage.cshtml</WebStackScaffolding_LayoutPageFile>
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<NameOfLastUsedPublishProfile>D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

17
Epost.TestToolsWeb/Global.asax.cs
View File

@ -28,8 +28,21 @@ namespace Epost.TestToolsWeb
}
/// <summary>
/// 跨域设置
/// </summary>
public void Application_BeginRequest()
{
//OPTIONS请求方法的主要作用：
//1、获取服务器支持的HTTP方法；也就是黑客经常用的方法。
//2、用来检查服务器的性能。如Ajax进行跨域请求是的预检，需要想另外一个域名的资源发送OPTIONS请求头，用以判断发送的请求是否安全
if (Request.Headers.AllKeys.Contains("Origin") && Request.HttpMethod == "OPTIONS")
{
//表示对输出的内容进行缓冲，执行page.Response.Flush()时，会等所有内容缓冲完毕，将内容发送到客户端
//这样就不会出错，造成页面卡死状态，让用户无限制等下去
Response.Flush();
}
}
}

2
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml
View File

@ -11,7 +11,7 @@
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<publishUrl>D:\驿传\SanYing_DAS-T后台</publishUrl>
<publishUrl>D:\驿传\T系列\taitan_songjiang_dengdai</publishUrl>
<DeleteExistingFiles>true</DeleteExistingFiles>
<PrecompileBeforePublish>true</PrecompileBeforePublish>
<EnableUpdateable>true</EnableUpdateable>

1360
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
View File

File diff suppressed because it is too large Load Diff

35
Epost.TestToolsWeb/Web.config
View File

@ -11,7 +11,7 @@
</configSections>
<connectionStrings>
<add name="weijie_dpsEntities" connectionString="metadata=res://*/WJDB.csdl|res://*/WJDB.ssdl|res://*/WJDB.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=weijie_dps;user id=sa;password=123456;min pool size=4;max pool size=4;packet size=3072;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
<add name="SqlLocDPSConnection" connectionString="server=139.196.36.200;user id=EpostTest;password=antion;database=BaBi_DAS;min pool size=512;max pool size=512;packet size=3072" providerName="System.Data.SqlClient" />
<add name="SqlLocDPSConnection" connectionString="server=.;user id=sa;password=123456;database=taitan_dengdai_songjiang;min pool size=512;max pool size=512;packet size=3072" providerName="System.Data.SqlClient" />
<add name="MysqlLocDPSConnection" connectionString="Server=localhost;Port=3306;Database=world;User=root; Password=antion;SslMode=None;Pooling=true;Allow User Variables=True;" />
<add name="WMSConnection" connectionString="data source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=139.196.36.200)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=EpostDB)));user id=C##Test;password=test" />
@ -27,12 +27,14 @@
<add key="ControlXML" value="/App_Data/EpostController.xml" />
<add key="LabelXML" value="/App_Data/AddressStorage.xml" />
<add key="ResultsXML" value="/App_Data/Results.xml" />
<add key="WebAPIUrl" value="http://localhost:63119/api/WebAPI/ProcessingResult"/>
<add key="WebAPIUrl" value="http://192.168.3.65:8051/api/WebAPI/ProcessingResult"/>
<add key="ShowMode" value="1" />
<add key="SetupMode" value="\Epost_P\Epost.TestToolsWeb\App_Data\SetupMode.txt" />
<add key="CARID" value="HT01" />
<add key="ServerAPIURL" value="http://localhost:63119/api/WebAPI" />
<add key="SleepTime" value="1" />
<add key="ServerAPIURL" value="http://192.168.3.65:8051/api/WebAPI" />
<add key="SleepTime" value="1" />
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@ -55,6 +57,18 @@
<sessionState mode="InProc" timeout="518400" />
</system.web>
<system.webServer>
<!-- 跨域访问配置 -->
<httpProtocol>
<customHeaders>
<!--相应类型（值为逗号分隔的一个字符串，表明服务器支持的所有跨域请求的方法）-->
<add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS"/>
<!--响应头设置（Content-Type：只限于三个值application/x-www-form-urlencoded、multipart/form-data、text/plain）-->
<add name="Access-Control-Allow-Headers" value="*"/>
<!--允许跨域访问的网址-->
<add name="Access-Control-Allow-Origin" value="*"/>
<!--<add name="Access-Control-Allow-Origin" value="http://www.yabyy.com,http://bbs.yabyy.com"/>-->
</customHeaders>
</httpProtocol>
<modules>
<remove name="FormsAuthentication" />
<remove name="ApplicationInsightsWebTracking" />
@ -162,20 +176,7 @@
<loggerToMatch value="System_Log" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<appender name="SystemLogAppender_LightUp" type="log4net.Appender.RollingFileAppender">
<file value="Log/System_Log/" />
<appendToFile value="true" />