From 520067288fb790f50d7732ef8570b3b7f1205d4b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 17:42:24 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/FormCC.Designer.cs | 50 ++++++++++
CC/iWareCC_ASRS/Connected Services/StationService/item3.xsd | 3
CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs | 22 +++
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/4、DataProcess_RobotBuffer_ForceOutbound.cs | 102 ++++++++++++++++++++
CC/iWareCC_ASRS/FormCC.cs | 23 ++++
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/2、DataProcess_RobotBuffer_IssueOutboundTask.cs | 30 +++++-
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs | 13 ++
SDA/iWareSda/App.config | 4
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs | 5
CC/iWareCC_ASRS/iWareCC.csproj | 1
10 files changed, 241 insertions(+), 12 deletions(-)
diff --git a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
index 2e97070..c9c000d 100644
--- a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
+++ b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
@@ -194,6 +194,9 @@
private short R_DestinationField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool R_ForceOutboundModeField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private bool R_InboundFinishField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -290,6 +293,19 @@
if ((this.R_DestinationField.Equals(value) != true)) {
this.R_DestinationField = value;
this.RaisePropertyChanged("R_Destination");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public bool R_ForceOutboundMode {
+ get {
+ return this.R_ForceOutboundModeField;
+ }
+ set {
+ if ((this.R_ForceOutboundModeField.Equals(value) != true)) {
+ this.R_ForceOutboundModeField = value;
+ this.RaisePropertyChanged("R_ForceOutboundMode");
}
}
}
@@ -498,7 +514,7 @@
private int W_Destination_InField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private string W_Destination_OutField;
+ private int W_Destination_OutField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_HeightField;
@@ -621,12 +637,12 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public string W_Destination_Out {
+ public int W_Destination_Out {
get {
return this.W_Destination_OutField;
}
set {
- if ((object.ReferenceEquals(this.W_Destination_OutField, value) != true)) {
+ if ((this.W_Destination_OutField.Equals(value) != true)) {
this.W_Destination_OutField = value;
this.RaisePropertyChanged("W_Destination_Out");
}
diff --git a/CC/iWareCC_ASRS/Connected Services/StationService/item3.xsd b/CC/iWareCC_ASRS/Connected Services/StationService/item3.xsd
index db171e8..9430007 100644
--- a/CC/iWareCC_ASRS/Connected Services/StationService/item3.xsd
+++ b/CC/iWareCC_ASRS/Connected Services/StationService/item3.xsd
@@ -12,6 +12,7 @@
<xs:element minOccurs="0" name="R_AlarmCode" type="xs:short" />
<xs:element minOccurs="0" name="R_AlarmCodeMsg" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="R_Destination" type="xs:short" />
+ <xs:element minOccurs="0" name="R_ForceOutboundMode" type="xs:boolean" />
<xs:element minOccurs="0" name="R_InboundFinish" type="xs:boolean" />
<xs:element minOccurs="0" name="R_InboundNumber" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="R_Inbound_TaskID" type="xs:short" />
@@ -41,7 +42,7 @@
<xs:element minOccurs="0" name="W_CartonWidth" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="W_DataFinish" type="xs:boolean" />
<xs:element minOccurs="0" name="W_Destination_In" type="xs:int" />
- <xs:element minOccurs="0" name="W_Destination_Out" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="W_Destination_Out" type="xs:int" />
<xs:element minOccurs="0" name="W_Height" type="xs:short" />
<xs:element minOccurs="0" name="W_InboundFinishConfirm" type="xs:boolean" />
<xs:element minOccurs="0" name="W_Inbound_TaskID" type="xs:short" />
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index 6c5286f..47ff185 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -470,6 +470,10 @@
this.dataGridViewTextBoxColumn63 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btn_Find_OutTaskRetryToMes = new System.Windows.Forms.Button();
this.lbl_RobotMode = new System.Windows.Forms.Label();
+ this.tb_PackageCode = new System.Windows.Forms.TextBox();
+ this.label23 = new System.Windows.Forms.Label();
+ this.button24 = new System.Windows.Forms.Button();
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask = new System.Windows.Forms.Label();
this.tPTransAsrs.SuspendLayout();
this.panel14.SuspendLayout();
this.panel15.SuspendLayout();
@@ -2801,6 +2805,7 @@
//
// panel_Model
//
+ this.panel_Model.Controls.Add(this.lbl_currHandlerPackageCodeForIssueOutboundTask);
this.panel_Model.Controls.Add(this.lbl_RobotMode);
this.panel_Model.Controls.Add(this.rBOnlyIn);
this.panel_Model.Controls.Add(this.lbl_IsSimulationPLC);
@@ -5474,6 +5479,9 @@
//
// tabPage3
//
+ this.tabPage3.Controls.Add(this.button24);
+ this.tabPage3.Controls.Add(this.tb_PackageCode);
+ this.tabPage3.Controls.Add(this.label23);
this.tabPage3.Controls.Add(this.button23);
this.tabPage3.Controls.Add(this.tb_wlm);
this.tabPage3.Controls.Add(this.label22);
@@ -5833,6 +5841,44 @@
this.lbl_RobotMode.Size = new System.Drawing.Size(127, 15);
this.lbl_RobotMode.TabIndex = 12;
this.lbl_RobotMode.Text = "缓存岛机器人模式";
+ //
+ // tb_PackageCode
+ //
+ this.tb_PackageCode.Location = new System.Drawing.Point(856, 427);
+ this.tb_PackageCode.Name = "tb_PackageCode";
+ this.tb_PackageCode.Size = new System.Drawing.Size(339, 25);
+ this.tb_PackageCode.TabIndex = 154;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Location = new System.Drawing.Point(794, 437);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(45, 15);
+ this.label23.TabIndex = 153;
+ this.label23.Text = "包号:";
+ //
+ // button24
+ //
+ this.button24.BackColor = System.Drawing.Color.Aqua;
+ this.button24.Location = new System.Drawing.Point(817, 489);
+ this.button24.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button24.Name = "button24";
+ this.button24.Size = new System.Drawing.Size(155, 48);
+ this.button24.TabIndex = 155;
+ this.button24.Text = "强制该包号出库";
+ this.button24.UseVisualStyleBackColor = false;
+ this.button24.Click += new System.EventHandler(this.button24_Click);
+ //
+ // lbl_currHandlerPackageCodeForIssueOutboundTask
+ //
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.AutoSize = true;
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Location = new System.Drawing.Point(275, 693);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Name = "lbl_currHandlerPackageCodeForIssueOutboundTask";
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Size = new System.Drawing.Size(172, 15);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.TabIndex = 14;
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Text = "当前下发出库任务的包号";
//
// FormCC
//
@@ -6347,6 +6393,10 @@
private System.Windows.Forms.Label label22;
private System.Windows.Forms.Button button23;
private System.Windows.Forms.Label lbl_RobotMode;
+ private System.Windows.Forms.Button button24;
+ private System.Windows.Forms.TextBox tb_PackageCode;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.Label lbl_currHandlerPackageCodeForIssueOutboundTask;
}
}
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index c1cd1ad..b423e3d 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -38,6 +38,11 @@
public static bool IsAllowRunOutMode = false;
/// <summary>
+ /// 褰撳墠涓嬪彂鍑哄簱浠诲姟鐨勫寘鍙�
+ /// </summary>
+ public static string currHandlerPackageCodeForIssueOutboundTask = "";
+
+ /// <summary>
/// 1鍙峰爢鍨涙満鍏ュ簱鍙ｆ壂鐮佸己鍒堕獙璇侀�氳繃
/// </summary>
public static bool Srm1_IN_SMQZYZTG = false;
@@ -1831,6 +1836,7 @@
}
this.lbl_RobotMode.Text = "缂撳瓨宀涙満鍣ㄤ汉妯″紡:" + (IsAllowRunOutMode ? "鍑哄簱妯″紡" : "鍏ュ簱妯″紡");
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Text = "褰撳墠涓嬪彂鍑哄簱浠诲姟鐨勫寘鍙�:" + currHandlerPackageCodeForIssueOutboundTask;
}
}
@@ -3535,5 +3541,22 @@
{
}
+
+ private void button24_Click(object sender, EventArgs e)
+ {
+ //寮哄埗璇ュ寘鍙峰嚭搴�
+ var packageCode = this.tb_PackageCode.Text.Trim();
+
+ var alertMsg = "";
+ DataProcess_RobotBuffer_ForceOutbound.Handler(packageCode, ref alertMsg);
+ if (!string.IsNullOrEmpty(alertMsg))
+ {
+ MessageBox.Show("閿欒:" + alertMsg);
+ }
+ else
+ {
+ MessageBox.Show("宸插鐞�");
+ }
+ }
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
index fcb9640..72ebdb7 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
@@ -24,6 +24,7 @@
/// </summary>
public static class DataProcess_RobotBuffer_IssueOutboundTask
{
+
public static async void Handler()
{
var alertMsg = "";
@@ -53,18 +54,37 @@
}
//鍙栧垱寤烘椂闂存渶鏃╃殑閭ｄ釜瑕佸嚭搴撶殑鍖�
- var firstTask = wmsDB.wms_rbline_task.Where(x =>
+ if (string.IsNullOrEmpty(FormCC.currHandlerPackageCodeForIssueOutboundTask))
+ {
+ var firstTask = wmsDB.wms_rbline_task.Where(x =>
x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
&& x.TaskStatus == (int)TaskStatusEnum.鏂板缓).OrderBy(x => x.CreateTime).FirstOrDefault();
- if (firstTask == null)
+ if (firstTask == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()},鏍规嵁 娌℃湁鎵惧埌 鏂板缓 鐨勪换鍔� ";
+ FormCC.currHandlerPackageCodeForIssueOutboundTask = "";
+ continue;
+ }
+ FormCC.currHandlerPackageCodeForIssueOutboundTask = firstTask.PackageCode;
+ }
+ else
{
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()},鏍规嵁 娌℃湁鎵惧埌 鏂板缓 鐨勪换鍔� ";
- continue;
+ var firstTask = wmsDB.wms_rbline_task.Where(x =>
+ x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
+ && x.TaskStatus == (int)TaskStatusEnum.鏂板缓
+ && x.PackageCode == FormCC.currHandlerPackageCodeForIssueOutboundTask
+ ).OrderBy(x => x.CreateTime).FirstOrDefault();
+ if (firstTask == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()},鏍规嵁 娌℃湁鎵惧埌 鏂板缓 鐨勪换鍔� ";
+ FormCC.currHandlerPackageCodeForIssueOutboundTask = "";
+ continue;
+ }
}
var taskList = wmsDB.wms_rbline_task.Where(x =>
x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
- && x.TaskStatus == (int)TaskStatusEnum.鏂板缓).Where(x => x.PackageCode == firstTask.PackageCode).OrderBy(x => x.CreateTime).ToList();
+ && x.TaskStatus == (int)TaskStatusEnum.鏂板缓).Where(x => x.PackageCode == FormCC.currHandlerPackageCodeForIssueOutboundTask).OrderBy(x => x.CreateTime).ToList();
if (taskList == null)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()},鏍规嵁 娌℃湁鎵惧埌 鏂板缓 鐨勪换鍔� ";
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/4\343\200\201DataProcess_RobotBuffer_ForceOutbound.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/4\343\200\201DataProcess_RobotBuffer_ForceOutbound.cs"
new file mode 100644
index 0000000..c77916d
--- /dev/null
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/4\343\200\201DataProcess_RobotBuffer_ForceOutbound.cs"
@@ -0,0 +1,102 @@
+锘縰sing Admin.NET.Application;
+using iWareCommon.Common.Globle;
+using iWareCommon.Utils;
+using iWareModel;
+using iWareSql.DataAccess;
+using iWareSql.WmsDBModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace iWareCC.ThreadService
+{
+ /// <summary>
+ /// 鏈哄櫒浜虹紦瀛樺矝 浜哄伐寮哄埗鍑哄簱 澶勭悊
+ /// </summary>
+ public static class DataProcess_RobotBuffer_ForceOutbound
+ {
+ public static bool Handler(string packageCode, ref string alertMsg)
+ {
+ alertMsg = "";
+ LogType logType = LogType.DataProcess_RobotBuffer_AutoQiTaoOutbound;
+
+ try
+ {
+
+ var rgvLocation = StationLocationEnum.BZ39.ToString();
+ var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
+ if (obj.R_ForceOutboundMode == false)
+ {
+ alertMsg = "PLC涓嶆槸寮哄埗鍑哄簱妯″紡";
+ return false;
+ }
+ using (WmsDBModel wmsDB = new WmsDBModel())
+ {
+ List<wms_stock_quan> qunList = wmsDB.wms_stock_quan.Where(x => x.StockStatus == (int)StockStatusEnum.鍦ㄥ簱
+ && x.PackageCode == packageCode
+ ).ToList();
+
+ foreach (var x in qunList)
+ {
+ x.StockStatus = (int)StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴�;
+
+ //鐢熸垚鍑哄簱浠诲姟
+ //璁板綍浠诲姟
+ var _id = Yitter.IdGenerator.YitIdHelper.NextId();
+ var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
+ var new_task = new wms_rbline_task()
+ {
+ Id = _id,
+ TaskNo = plcTaskNo,
+
+ UPI = x.Upi,
+ Length = x.Length,
+ Width = x.Width,
+ Thk = x.Thk,
+ IssueTime = DateTime.Now,
+ PlanNo = x.PlanNo,
+ OrderId = x.OrderId,
+ PackageCode = x.PackageCode,
+ PlaceCode = x.PlaceCode,
+ RbTaskType = (int)RbTaskTypeEnum.鍑哄簱浠诲姟,
+ RbTaskTypeEnumName = RbTaskTypeEnum.鍑哄簱浠诲姟.ToString(),
+ TaskStatus = (int)TaskStatusEnum.鏂板缓,
+ TaskStatusName = TaskStatusEnum.鏂板缓.ToString(),
+ TaskMsg = "浜哄伐寮哄埗寰呭嚭搴�",
+
+
+ CreateTime = DateTime.Now,
+ CreateUserName = "CC",
+ UpdateTime = DateTime.Now,
+ UpdateUserName = "CC",
+ };
+
+ wmsDB.wms_rbline_task.Add(new_task);
+
+ var place = StationHandler.GetPlaceByPlaceCode(x.PlaceCode, wmsDB);
+ place.PlaceStatus = (int)PlaceStatusEnum.閿佸畾;
+
+ Thread.Sleep(100);
+ }
+
+
+
+ wmsDB.SaveChanges();
+ }
+
+ return true;
+
+ }
+ catch (Exception ex)
+ {
+ alertMsg = " 鍑虹幇寮傚父:" + ex.Message;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ Log4NetHelper.WriteErrorLog(logType, " 鍑虹幇寮傚父锛�" + ex.Message, ex);
+
+ return false;
+ }
+ }
+ }
+}
diff --git a/CC/iWareCC_ASRS/iWareCC.csproj b/CC/iWareCC_ASRS/iWareCC.csproj
index c71096e..3b9ef2f 100644
--- a/CC/iWareCC_ASRS/iWareCC.csproj
+++ b/CC/iWareCC_ASRS/iWareCC.csproj
@@ -156,6 +156,7 @@
<Compile Include="ThreadService\00_269宸ヤ綅\DataProcess_269.cs" />
<Compile Include="ThreadService\01_BZ01宸ヤ綅锛堟竻鐏帮紝娲楁澘鍚庡伐浣嶏級\DataProcess_BZ01.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡DataProcess_RobotBuffer_ModeChange.cs" />
+ <Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\4銆丏ataProcess_RobotBuffer_ForceOutbound.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\2銆丏ataProcess_RobotBuffer_IssueOutboundTask.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\1銆丏ataProcess_RobotBuffer_AutoQiTaoOutbound.cs" />
<Compile Include="ThreadService\02_BZ39宸ヤ綅锛堣ˉ鏉垮悗宸ヤ綅锛塡Outbound\3銆丏ataProcess_RobotBuffer_FinishTaskForOutbound.cs" />
diff --git a/SDA/iWareSda/App.config b/SDA/iWareSda/App.config
index e4067c0..7f35a5c 100644
--- a/SDA/iWareSda/App.config
+++ b/SDA/iWareSda/App.config
@@ -4,8 +4,8 @@
<!-- 璇█閰嶇疆 閰嶇疆 0 涓枃 1 鑻辨枃 -->
<add key="LanguageFlg" value="0"/>
<!-- 绔欑偣鐨凱LC 閰嶇疆 -->
- <!-- <add key="Station_Address" value="172.17.51.202"/> -->
- <add key="Station_Address" value="192.168.10.100"/>
+ <add key="Station_Address" value="172.17.51.202"/>
+ <!-- <add key="Station_Address" value="192.168.10.100"/> -->
<add key="Station_Rack" value="0"/>
<add key="Station_Slot" value="1"/>
<add key="Station_Port" value="102"/>
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index 4cc06d5..871b4fa 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -407,6 +407,12 @@
/// </summary>
[Description("鍑哄簱浠诲姟鍙�")]
public short R_Outbound_TaskID { get; set; }
+
+ /// <summary>
+ /// 寮哄埗鍑哄簱妯″紡
+ /// </summary>
+ [Description("寮哄埗鍑哄簱妯″紡")]
+ public bool R_ForceOutboundMode { get; set; }
}
public class StationDBForReadComm
@@ -467,5 +473,12 @@
[Description("鍑哄簱浠诲姟鍙�")]
public string R_Outbound_TaskID { get; set; }
+
+ /// <summary>
+ /// 寮哄埗鍑哄簱妯″紡
+ /// </summary>
+ [Description("寮哄埗鍑哄簱妯″紡")]
+ public string R_ForceOutboundMode { get; set; }
+
}
}
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index 61b8c06..427bbcb 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -176,7 +176,8 @@
W_ReqOut = W_DBHeaderWithSeparate_BZ39 + "12.0",
W_Destination_Out = W_DBHeaderWithSeparate_BZ39 + "14.0",
W_Mode = W_DBHeaderWithSeparate_BZ39 + "18.0",
- W_OutboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.2"
+ W_OutboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.2",
+
});
@@ -223,6 +224,8 @@
R_Inbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "112.0",
R_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "114.0",
+ R_ForceOutboundMode = W_DBHeaderWithSeparate_BZ39 + "50.3",
+
});
--
Gitblit v1.9.3