From 0f53865f0f829876743614afb6c15c172d4fbcdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Tue, 13 Aug 2024 16:35:42 +0800
Subject: [PATCH 1/8] 13
---
.gitignore | 1 +
src/Khd.Core.Wpf/appsettings.json | 53 -------------------------------
2 files changed, 1 insertion(+), 53 deletions(-)
delete mode 100644 src/Khd.Core.Wpf/appsettings.json
diff --git a/.gitignore b/.gitignore
index b8fd38f..d8abe29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -341,3 +341,4 @@ healthchecksdb
appsettings.demo.json
/src/Khd.Core.Wcs/appsettings.json
+/src/Khd.Core.Wpf/appsettings.json
diff --git a/src/Khd.Core.Wpf/appsettings.json b/src/Khd.Core.Wpf/appsettings.json
deleted file mode 100644
index 92204c3..0000000
--- a/src/Khd.Core.Wpf/appsettings.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "ConnectionStrings": {
- //mysql 本地
- //"DefaultConnection": "server=106.12.13.113;port=3306;database=khd_jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True"
- //khd服务器
- //"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
- "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True"
- // "DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
- },
- "PlcConfigs": [
- {
- "IP": "192.168.2.30",
- "Port": 102, //102是默认端口
- "CpuType": 40,
- "Rack": 0,
- "Slot": 1,
- "Code": 0
- },
- {
- "IP": "192.168.2.31",
- "Port": 102, //102是默认端口
- "CpuType": 40,
- "Rack": 0,
- "Slot": 1,
- "Code": 1
- },
- {
- "IP": "192.168.2.220",
- "Port": 102, //102是默认端口
- "CpuType": 40,
- "Rack": 0,
- "Slot": 1,
- "Code": 2
- }
- ],
- "PLCSetting": {
- "Mode": "0",
- "EquipCode": "H61,H62,H63",
- "Interval": "2000",
- "AutoStart": "0",
- "WaitTime": "60000",
- "SiteCode": "999"
- },
- "ThriftConfig": {
- "ThriftIpAddress": "127.0.0.1",
- "JiesShouDuanKou": 9092,
- "TuiSongDuankou": 9094,
- "upsite": "k48"
- },
- "FlagConfig": {
- "UpFlagNum": 1
- }
-}
From 0e0457a2a9d83222568f7dc33a117c418eae6470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Tue, 13 Aug 2024 16:35:47 +0800
Subject: [PATCH 2/8] 1
---
src/Khd.Core.Wcs/MainCentralControl.cs | 4 ++--
src/Khd.Core.Wcs/Wcs/FirstFloor.cs | 3 +--
src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs | 8 ++------
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs
index acaa838..0c3e843 100644
--- a/src/Khd.Core.Wcs/MainCentralControl.cs
+++ b/src/Khd.Core.Wcs/MainCentralControl.cs
@@ -62,7 +62,7 @@ namespace Khd.Core.Wcs
}
}
//创建定时器
- SystemTimer systemTimer = new SystemTimer(_host);
+ SystemTimer systemTimer = new(_host);
systemTimer.Start();
//创建任务
@@ -94,7 +94,7 @@ namespace Khd.Core.Wcs
thirdFloorAGV.StartPoint();
//四楼接驳位
- FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4);
+ FourthFloorPoint fourthFloorPoint = new(_host, 4);
fourthFloorPoint.StartPoint();
//五层接驳位
diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index 8143187..6ac101c 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
@@ -24,7 +24,6 @@ namespace Khd.Core.Wcs.Wcs
/// 一楼RFID 读
///
private readonly BasePlcpoint RFID001;
- private readonly BasePlcpoint automatic;
///
/// 到位信号 读
///
@@ -72,8 +71,8 @@ namespace Khd.Core.Wcs.Wcs
this.linesignal01 = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("FirstFloorLine") && t.plcpointNo.Contains("linesignal01"));
//一楼提升机流水号 读
this.serialno06 = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("Hoister") && t.plcpointNo.Contains("serialno06"));
+ // Mes 关闭
this.mesClose = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("Hoister") && t.plcpointNo.Contains("mesclose"));
- this.automatic = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("Hoister") && t.plcpointNo.Contains("automatic"));
//一楼提升机状态 读
this.equipstate06 = StaticData.BasePlcpointList.First(t => t.equipmentNo.Contains("Hoister") && t.plcpointNo.Contains("equipstate06"));
//一楼提升机任务状态 读
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
index e7dbbf1..5cd2bf6 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
+++ b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
@@ -20,7 +20,6 @@ namespace Khd.Core.Wcs.Wcs
///
public class FiveFloorCTU
{
- List ScanPoint { get; set; }//点位信息
private readonly IHost _host;
private readonly LoggerUtils _logger = new LoggerUtils();
private readonly BasePlcpoint LineRFID;
@@ -151,13 +150,10 @@ namespace Khd.Core.Wcs.Wcs
{
if (task.taskType == StaticTaskType.FiveAccessoryOut)
{
- dbContext.WcsTask.Where(t => t.objid == task.objid).Delete();
+ //dbContext.WcsTask.Where(t => t.objid == task.objid).Delete();
#region 如果已经开始入库,还有出库任务，删除出库任务
List outTasks = dbContext.WcsTask.Where(t => t.taskType == StaticTaskType.FiveAccessoryOut && t.taskStatus == 6).ToList();
- if(outTasks!=null && outTasks.Count > 0)
- {
- dbContext.RemoveRange(outTasks);
- }
+ dbContext.RemoveRange(outTasks);
#endregion
//根据rfid找到库位
//生成入库任务
From 092c96929930d84e5f5d7ad9aa998265a8639edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Thu, 15 Aug 2024 14:05:42 +0800
Subject: [PATCH 3/8] 1
---
src/Khd.Core.Wcs/appsettings.json | 50 +++++++++++++++++++++++++++++
src/Khd.Core.Wpf/appsettings.json | 53 +++++++++++++++++++++++++++++++
2 files changed, 103 insertions(+)
create mode 100644 src/Khd.Core.Wcs/appsettings.json
create mode 100644 src/Khd.Core.Wpf/appsettings.json
diff --git a/src/Khd.Core.Wcs/appsettings.json b/src/Khd.Core.Wcs/appsettings.json
new file mode 100644
index 0000000..fb47994
--- /dev/null
+++ b/src/Khd.Core.Wcs/appsettings.json
@@ -0,0 +1,50 @@
+{
+ "ConnectionStrings": {
+ //"DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True",
+ //"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+ //"DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+ "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+ },
+ "DeleteLogDays": 10,//删除日志的时间间隔，单位：天
+ "PlcConfigs": [
+ {
+ "IP": "192.168.2.30",
+ "Port": 102, //102是默认端口
+ "CpuType": 40,
+ "Rack": 0,
+ "Slot": 1,
+ "Code": 0
+ }, //提升机，接驳位
+ {
+ "IP": "192.168.2.31",
+ "Port": 102, //102是默认端口
+ "CpuType": 40,
+ "Rack": 0,
+ "Slot": 1,
+ "Code": 1
+ }, //U型线
+ {
+ "IP": "192.168.2.220",
+ "Port": 102, //102是默认端口
+ "CpuType": 40,
+ "Rack": 0,
+ "Slot": 1,
+ "Code": 2
+ } //二楼三楼设备，陈工提供。
+ ],
+ "PLCSetting": {
+ "Mode": "0",
+ "EquipCode": "H61,H62,H63",
+ "Interval": "2000",
+ "AutoStart": "0",
+ "WaitTime": "60000",
+ "SiteCode": "999"
+ },
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft": "Error",
+ "Microsoft.Hosting.Lifetime": "Information"
+ }
+ }
+}
diff --git a/src/Khd.Core.Wpf/appsettings.json b/src/Khd.Core.Wpf/appsettings.json
new file mode 100644
index 0000000..92204c3
--- /dev/null
+++ b/src/Khd.Core.Wpf/appsettings.json
@@ -0,0 +1,53 @@
+{
+ "ConnectionStrings": {
+ //mysql 本地
+ //"DefaultConnection": "server=106.12.13.113;port=3306;database=khd_jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True"
+ //khd服务器
+ //"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+ "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True"
+ // "DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+ },
+ "PlcConfigs": [
+ {
+ "IP": "192.168.2.30",
+ "Port": 102, //102是默认端口
+ "CpuType": 40,
+ "Rack": 0,
+ "Slot": 1,
+ "Code": 0
+ },
+ {
+ "IP": "192.168.2.31",
+ "Port": 102, //102是默认端口
+ "CpuType": 40,
+ "Rack": 0,
+ "Slot": 1,
+ "Code": 1
+ },
+ {
+ "IP": "192.168.2.220",
+ "Port": 102, //102是默认端口
+ "CpuType": 40,
+ "Rack": 0,
+ "Slot": 1,
+ "Code": 2
+ }
+ ],
+ "PLCSetting": {
+ "Mode": "0",
+ "EquipCode": "H61,H62,H63",
+ "Interval": "2000",
+ "AutoStart": "0",
+ "WaitTime": "60000",
+ "SiteCode": "999"
+ },
+ "ThriftConfig": {
+ "ThriftIpAddress": "127.0.0.1",
+ "JiesShouDuanKou": 9092,
+ "TuiSongDuankou": 9094,
+ "upsite": "k48"
+ },
+ "FlagConfig": {
+ "UpFlagNum": 1
+ }
+}
From 6b9ad7170f403dc0d26b4528f851e9a6ee4fd6a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Tue, 20 Aug 2024 09:06:37 +0800
Subject: [PATCH 4/8] 0820
---
src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
index 100b8ad..399665d 100644
--- a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
+++ b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
@@ -377,7 +377,7 @@ namespace Khd.Core.Wcs.Wcs
.Where(t => t.locationStatus == "1")
.OrderByDescending(t => t.locColumn)
.ToList();
-
+
List containerCodes = wmsBaseLocations
.Where(t => t.locDeep == 1)
.Select(t => t.containerCode).ToList();//深库位的托盘
From 808b7c1b0e58e2fc076bde534af9259655fe3641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Sat, 21 Sep 2024 13:42:20 +0800
Subject: [PATCH 5/8] 1
---
src/Khd.Core.Plc/StaticPlcHelper.cs | 1 +
src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs | 2 +-
src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs | 1 -
src/Khd.Core.Wcs/Wcs/SystemTimer.cs | 1 +
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Khd.Core.Plc/StaticPlcHelper.cs b/src/Khd.Core.Plc/StaticPlcHelper.cs
index 3d96e5e..f61f755 100644
--- a/src/Khd.Core.Plc/StaticPlcHelper.cs
+++ b/src/Khd.Core.Plc/StaticPlcHelper.cs
@@ -69,6 +69,7 @@ namespace Khd.Core.Plc
///
public static object GetValue(string? len, object value)
{
+
if (len == "2")
{
return Convert.ToInt16(value);
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
index 457815b..ed6a216 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
+++ b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
@@ -10,7 +10,6 @@ using Masuit.Tools;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Newtonsoft.Json;
-using System.Diagnostics;
using Z.EntityFramework.Plus;
namespace Khd.Core.Wcs.Wcs
@@ -351,6 +350,7 @@ namespace Khd.Core.Wcs.Wcs
}
return false;
}
+
///
/// 监控上件扫描点位
///
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
index 8b8bddf..e924958 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
+++ b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
@@ -63,7 +63,6 @@ namespace Khd.Core.Wcs.Wcs
BaseEquip baseEquip = StaticData.BaseEquip.First(t => t.equipType == 1 && t.floorNo == FloorNo);
if (rfid != null && isSignal != null)
{
-
//正常读到输送线信息 有到位信号,并且有托盘,获取条码信息
if (Convert.ToInt32(isSignal) == 1)//五楼接驳位
{
diff --git a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
index 3b36c73..13a0a12 100644
--- a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
+++ b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
@@ -389,6 +389,7 @@ namespace Khd.Core.Wcs.Wcs
var dmsRecordAlarmInfo = CoreMapper.Map(alarmTime);
dmsRecordAlarmInfo.AlarmStatus = "0";
dmsRecordAlarmInfo.NoticeStatus = "0";
+ dbContext.Add(dmsRecordAlarmTime);
dbContext.Add(dmsRecordAlarmInfo);
dbContext.SaveChanges();
}
From cfceebf60dbc98bee6f5e279d6c8822564bb8686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Wed, 25 Sep 2024 12:09:14 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=85=88?=
=?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Khd.Core.Wcs/Program.cs | 3 ++-
src/Khd.Core.Wcs/Wcs/FirstFloor.cs | 5 ++++-
src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/Khd.Core.Wcs/Program.cs b/src/Khd.Core.Wcs/Program.cs
index caa6ecb..b00d3c4 100644
--- a/src/Khd.Core.Wcs/Program.cs
+++ b/src/Khd.Core.Wcs/Program.cs
@@ -1,4 +1,5 @@
-using Khd.Core.EntityFramework;
+using Khd.Core.Domain.Models;
+using Khd.Core.EntityFramework;
using Khd.Core.Library;
using Khd.Core.Wcs;
using Khd.Core.Wcs.Global;
diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index 6ac101c..84e60e9 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
@@ -319,6 +319,7 @@ namespace Khd.Core.Wcs.Wcs
fromFloorNo = 1,
floorNo = 4,
useFlag = 1,
+ ud1=20,
createBy = "一楼接驳位",
createTime = DateTime.Now,
remark = "一楼创建入库任务"
@@ -403,6 +404,7 @@ namespace Khd.Core.Wcs.Wcs
currPointNo = "TSJ_01",
nextPointId = T01,
nextPointNo = "TSJ_01",
+ ud1 = 20,
endPointId = warehouseId,
fromFloorNo = 1,
floorNo = TargetFloor.warehouseFloor,
@@ -522,7 +524,8 @@ namespace Khd.Core.Wcs.Wcs
if (Convert.ToInt32(equipstate06Value) == 0)
{
dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
- var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01 && t.taskStatus < 5).OrderBy(t => t.createTime).ToList();
+ var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01 && t.taskStatus < 5)
+ .OrderBy(t => t.ud1).OrderBy(t => t.createTime).ToList();
foreach (var wcsTask in wcsTasks)
{
_logger.Info($"当前任务?{wcsTask.ToJsonString()}");
diff --git a/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs
index b22963a..b4789f2 100644
--- a/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs
+++ b/src/Khd.Core.Wcs/Wcs/ThirdFloorPoint.cs
@@ -173,6 +173,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.currPointNo = baseEquip.equipNo;
newTask.fromFloorNo = FloorNo;
newTask.taskStatus = 0;
+ newTask.ud1 = 10;
newTask.updateTime = DateTime.Now;
dbContext.Add(newTask);
WcsTaskLog wcsTaskLog = CoreMapper.Map(newTask);
From 36875b2c87a4fc32519c452b27f2f51943a320d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Wed, 25 Sep 2024 12:11:46 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=85=88?=
=?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs | 1 +
src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs | 2 ++
2 files changed, 3 insertions(+)
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
index e924958..845dd9d 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
+++ b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
@@ -231,6 +231,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.nextPointNo = nextEquip.equipNo;
newTask.currPointId = baseEquip.objid;
newTask.currPointNo = baseEquip.equipNo;
+ newTask.ud1 = 20;
newTask.fromFloorNo = FloorNo;
newTask.taskType = 6;//成品出库
newTask.floorNo = 1;//出库楼层
diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
index 94ff384..5f140de 100644
--- a/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
+++ b/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
@@ -266,6 +266,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.createTime = DateTime.Now;
newTask.updateTime = DateTime.Now;
newTask.endPointId = endEquip.objid;
+ newTask.ud1 = 20;
newTask.endPointNo = endEquip.equipNo;
newTask.containerNo = rfid;
newTask.currPointId = lineEquip.objid;
@@ -292,6 +293,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.nextPointNo = tsjEquip.equipNo;
newTask.createTime = DateTime.Now;
newTask.updateTime = DateTime.Now;
+ newTask.ud1 = 20;
newTask.endPointId = endEquip.objid;
newTask.endPointNo = endEquip.equipNo;
newTask.containerNo = rfid;
From 8c707a27e01acb47a38352ae25fcb830778f4536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Wed, 25 Sep 2024 12:14:19 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs | 2 +-
src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
index 845dd9d..43af451 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
+++ b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs
@@ -231,7 +231,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.nextPointNo = nextEquip.equipNo;
newTask.currPointId = baseEquip.objid;
newTask.currPointNo = baseEquip.equipNo;
- newTask.ud1 = 20;
+ newTask.ud1 = 30;
newTask.fromFloorNo = FloorNo;
newTask.taskType = 6;//成品出库
newTask.floorNo = 1;//出库楼层
diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
index 5f140de..5b24cd6 100644
--- a/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
+++ b/src/Khd.Core.Wcs/Wcs/SecondFloorPoint.cs
@@ -266,7 +266,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.createTime = DateTime.Now;
newTask.updateTime = DateTime.Now;
newTask.endPointId = endEquip.objid;
- newTask.ud1 = 20;
+ newTask.ud1 = 30;
newTask.endPointNo = endEquip.equipNo;
newTask.containerNo = rfid;
newTask.currPointId = lineEquip.objid;
@@ -293,7 +293,7 @@ namespace Khd.Core.Wcs.Wcs
newTask.nextPointNo = tsjEquip.equipNo;
newTask.createTime = DateTime.Now;
newTask.updateTime = DateTime.Now;
- newTask.ud1 = 20;
+ newTask.ud1 = 30;
newTask.endPointId = endEquip.objid;
newTask.endPointNo = endEquip.equipNo;
newTask.containerNo = rfid;