WCSNet6.git - Gitblit

			@@ -2,6 +2,7 @@
			using Dm.filter;
			using DocumentFormat.OpenXml.Bibliography;
			using DocumentFormat.OpenXml.Drawing.Charts;
			using Elastic.Clients.Elasticsearch.Snapshot;
			using Elastic.Clients.Elasticsearch.Tasks;
			using Flurl.Util;
			using Furion.Logging;
			@@ -15,6 +16,7 @@
			using System.Data;
			using System.Reflection.Emit;
			using WCS.Application.Entity;
			using WCS.Application.Service.WcsDevice.Dto;
			using WCS.Application.Util;
			using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressIntracityUpdateStoreRequest.Types;
			using static SKIT.FlurlHttpClient.Wechat.Api.Models.NontaxInsertBillRequest.Types.CardExtra.Types.BillCard.Types;
			@@ -1512,7 +1514,7 @@
			// 反馈WMS
			var requestMode = new TaskRequestWMS()
			{
			TaskNo = modTask.TaskNo,
			TaskNo = modTask.TaskNo + modTask.EndLocate ,
			PalletNo = modTask.PalletNo,
			TaskType = ((int)TaskTypeEnum.Out).ToString(),
			TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
			@@ -1621,7 +1623,7 @@
			// 反馈WMS
			var requestMode = new TaskRequestWMS()
			{
			TaskNo = modTask.TaskNo,
			TaskNo = modTask.TaskNo + modTask.EndLocate ,
			PalletNo = modTask.PalletNo,
			TaskType = ((int)TaskTypeEnum.Out).ToString(),
			TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
			@@ -1800,7 +1802,7 @@
			{
			var plcConn = modDevice.PLCUtil;

			if (modDevice.DbNumber == "DB101" && modDevice.DbNumber == "DB102")
			if (modDevice.DbNumber == "DB101")//&& modDevice.DbNumber == "DB102"&& (modDevice.DbNumber == "DB102"\|\|modDevice.PlcIdIP == "10.18.51.110")
			{
			// 主扫交互流程
			switch (modDevice.Value.ToString())
			@@ -1870,11 +1872,12 @@
			}
			}
			}
			// 根据箱内品种号获取码躲绑定工位及对应的分道号
			var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo && w.Status == "1");
			if (checkTaskInfo == null)


			// 验证是否零箱
			if (boxInfo.BitBoxMark == "1")
			{
			// 绑定信息为null写入剔除通道号
			// 是零箱直接剔除，进行人工组托
			var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
			if (ret.IsSucceed)
			{
			@@ -1882,8 +1885,225 @@
			var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
			if (retVal.IsSucceed)
			{
			Log.Error("箱码未绑定分拣任务，进行剔除。");
			Log.Error("零箱，进行剔除。");
			break;
			}
			}
			break;
			}


			// 根据箱内品种号获取码躲绑定工位及对应的分道号
			var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo && w.Status == "1");
			if (checkTaskInfo == null)
			{
			// 判断是否关联单据 wcsordertask
			var orderModel = _db.Queryable<WcsOderTask>()
			.First(m => m.SkuNo == boxInfo.SkuNo && m.Status== TaskStatusEnum.Wait && m.LotNo == boxInfo.LotNo && m.IsDelete == false);
			if (orderModel != null)
			{
			// 根据boxinfo表产线字段自动绑定分道(1线产品只能绑定到8道)
			if (boxInfo.LineNo != "1")
			{// 绑定到除8道外其他道

			// 获取未绑定道
			var lineNoModels = _db.Queryable<WcsCheckTask>()
			.Where(m => m.Status == "0" && m.LineNo != "8" && m.RoboatType == PLCTypeEnum.RobotPalletizer).ToList();
			if (lineNoModels.Count > 0)
			{
			// 获取当前物料品种号
			var skuInfo = await _db.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == boxInfo.SkuNo).FirstAsync();
			if (skuInfo == null)
			{
			// 此产品若没设定品规，进行剔除处理。防止堵塞件箱线
			var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
			if (ret.IsSucceed)
			{
			// 写入流程控制字 2
			var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
			if (retVal.IsSucceed)
			{
			Log.Error("没有空闲分道，进行剔除。");
			break;
			}
			}
			break;
			}

			foreach (var lineNoModel in lineNoModels)
			{
			// 读取设备验证是否绑定分道
			var (respg, pzNo) = plcConn.GetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos);
			if (respg.IsSucceed)
			{
			if (pzNo != 0)
			{
			// plc此分道未解绑
			break;
			}
			else
			{
			// 自动绑定分道
			lineNoModel.OrderNo = orderModel.OrderNo;
			lineNoModel.LotNo = boxInfo.LotNo;
			lineNoModel.SkuNo = boxInfo.SkuNo;
			lineNoModel.SkuName = boxInfo.SkuName;
			lineNoModel.Qty = orderModel.Qty;
			lineNoModel.Status = "1";//已绑定
			lineNoModel.PZNo = skuInfo.PZNo;

			// 给PLC写入品规
			var ret = plcConn.SetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos, skuInfo.PZNo);
			if (ret.IsSucceed)
			{
			//写入流程字成功后更新分拣任务
			_db.Updateable(lineNoModel).ExecuteCommand();
			//更新WcsOderTask表
			orderModel.Status = TaskStatusEnum.Doing;
			_db.Updateable(orderModel).ExecuteCommand();
			// Liudl 通知前端更新分拣任务
			//下发分拣任务
			HubUtil.PublicCheckTask(lineNoModel.Adapt<WcsDeviceTaskOrderDto>());
			break;
			}
			else
			{
			throw Oops.Bah("与PCL交互失败，绑定失败！");
			}
			}
			}
			else
			{
			// 读取plc失败
			break;
			}
			}

			}
			else
			{
			// 若没有空闲道，进行剔除处理。防止堵塞件箱线
			var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
			if (ret.IsSucceed)
			{
			// 写入流程控制字 2
			var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
			if (retVal.IsSucceed)
			{
			Log.Error("没有空闲分道，进行剔除。");
			break;
			}
			}
			break;
			}
			}
			else
			{// 绑定到8道
			// 获取未绑定道
			var lineNo8Model = _db.Queryable<WcsCheckTask>()
			.First(m => m.Status == "0" && m.LineNo == "8" && m.RoboatType == PLCTypeEnum.RobotPalletizer);
			if (lineNo8Model != null)
			{
			// 获取当前物料品种号
			var skuInfo = await _db.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == boxInfo.SkuNo).FirstAsync();
			if (skuInfo == null)
			{
			// 此产品若没设定品规，进行剔除处理。防止堵塞件箱线
			var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
			if (ret.IsSucceed)
			{
			// 写入流程控制字 2
			var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
			if (retVal.IsSucceed)
			{
			Log.Error("没有空闲分道，进行剔除。");
			break;
			}
			}
			break;
			}


			// 读取设备验证是否绑定分道
			var (respg, pzNo) = plcConn.GetPlcDBValue(lineNo8Model.PosType, lineNo8Model.DbNumber, lineNo8Model.PlcPos);
			if (respg.IsSucceed)
			{
			if (pzNo != 0)
			{
			// plc此分道未解绑
			break;
			}
			else
			{
			// 自动绑定分道
			lineNo8Model.OrderNo = orderModel.OrderNo;
			lineNo8Model.LotNo = boxInfo.LotNo;
			lineNo8Model.SkuNo = boxInfo.SkuNo;
			lineNo8Model.SkuName = boxInfo.SkuName;
			lineNo8Model.Qty = orderModel.Qty;
			lineNo8Model.Status = "1";//已绑定
			lineNo8Model.PZNo = skuInfo.PZNo;

			// 给PLC写入品规
			var ret = plcConn.SetPlcDBValue(lineNo8Model.PosType, lineNo8Model.DbNumber, lineNo8Model.PlcPos, skuInfo.PZNo);
			if (ret.IsSucceed)
			{
			//写入流程字成功后更新分拣任务
			_db.Updateable(lineNo8Model).ExecuteCommand();
			//更新WcsOderTask表
			orderModel.Status = TaskStatusEnum.Doing;
			_db.Updateable(orderModel).ExecuteCommand();

			// Liudl 通知前端更新分拣任务
			//下发分拣任务
			HubUtil.PublicCheckTask(lineNo8Model.Adapt<WcsDeviceTaskOrderDto>());
			break;
			}
			else
			{
			throw Oops.Bah("与PCL交互失败，绑定失败！");
			}
			}
			}
			else
			{
			// 读取plc失败
			break;
			}


			}
			else
			{
			// 没有空闲道，进行剔除处理。防止堵塞件箱线
			var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
			if (ret.IsSucceed)
			{
			// 写入流程控制字 2
			var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
			if (retVal.IsSucceed)
			{
			Log.Error("没有空闲分道，进行剔除。");
			break;
			}
			}
			break;
			}
			}
			}
			else
			{
			// 不关联单据直接进行剔除处理
			var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
			if (ret.IsSucceed)
			{
			// 写入流程控制字 2
			var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
			if (retVal.IsSucceed)
			{
			Log.Error("箱码未绑定分拣任务，进行剔除。");
			break;
			}
			}
			}
			}
			@@ -2023,8 +2243,8 @@
			//是否结批箱
			if (boxInfo[0].EndLotFlag == "1" && retVal.IsSucceed)
			{
			// 触发结批解绑分道
			AutoEndLot(boxInfo[0].LotNo, plcConn, "0");
			// 触发结批分道变为结批中
			AutoEndLot(boxInfo[0].LotNo, plcConn, "2");
			}
			}
			else
			@@ -2167,6 +2387,7 @@
			string sqlStr2 = $"delete from WCSBoxInfoLog where IsDelete=0 and PalletNo='{palletNo}'";
			_db.Ado.ExecuteCommand(sqlStr2);
			}

			// 向WMS申请巷道
			var http = new HttpService();
			string TaskNo = "", EndLocate = "";
			@@ -2179,6 +2400,29 @@
			}
			else
			{
			//判断是否结批中
			var (res, jiepi) = plcConn.GetPlcDBValue(checkTaskMedel.PosType, modDevice.DbNumber, checkTaskMedel.PosLot);
			if (jiepi == 2)//结批中
			{
			// 分道解绑，抓箱品种写入0
			var ret1 = plcConn.SetPlcDBValue(checkTaskMedel.PosTypeLot, modDevice.DbNumber, checkTaskMedel.PlcPos, "0");
			if (ret1.IsSucceed)
			{
			//写入流程字成功后更新分拣任务 liudl 最后一托盘申请完入库才可清空
			checkTaskMedel.OrderNo = "";
			checkTaskMedel.TaskNo = "";
			checkTaskMedel.LotNo = "";
			checkTaskMedel.SkuNo = "";
			checkTaskMedel.SkuName = "";
			checkTaskMedel.BoxType = "";
			checkTaskMedel.Qty = 0;
			checkTaskMedel.PZNo = "";
			checkTaskMedel.Status = "0"; // 绑定分道 0：解绑 1：绑定

			//更新分拣任务
			_db.Updateable(checkTaskMedel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
			}
			}
			// 获取入库任务信息
			var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
			if (taskModel != null)
			@@ -2376,7 +2620,7 @@
			// 写入结批信号
			var ret = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "1");
			// 分道解绑，抓箱品种写入0
			var ret1 = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PlcPos, "0");
			//var ret1 = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PlcPos, "0");
			if (ret.IsSucceed)
			{
			//写入流程字成功后更新分拣任务 liudl 最后一托盘申请完入库才可清空
			@@ -2388,7 +2632,7 @@
			//item.BoxType = "";
			//item.Qty = 0;
			item.PZNo = "";
			item.Status = status; // 绑定分道 0：解绑 1：绑定
			item.Status = status; // 绑定分道 0：解绑 1：绑定 2:结批中

			//更新分拣任务
			_db.Updateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();