From 3c1646a85f085cb0dd8dd386cdcdcd5a221adc4d Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周五, 22 11月 2024 13:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/App.config | 2
SDA/iWareSda/Common/SdaHelper.cs | 9 ++++
CC/iWareCC_ASRS/App - 本机.config | 2
SDA/iWareModel/EnumType/EDevice/EDevice.cs | 5 +-
CC/iWareCC_ASRS/FormCC.cs | 2
SDA/iWareSda/Common/Struct/WareSdaStruct.cs | 7 +--
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs | 4 +-
SDA/iWareSda/App.config | 3 +
CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs | 6 +++
CC/iWareCC_ASRS/App - 正式.config | 2
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 4 +-
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs | 7 +++
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue | 6 +-
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | 19 +++++----
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Admin.NET.Application.csproj | 5 ++
SDA/iWareSda/PLCService/Default/Siemens_HslCommunicationService.cs | 4 ++
16 files changed, 59 insertions(+), 28 deletions(-)
diff --git "a/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config" "b/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config"
index bed6f34..eec317c 100644
--- "a/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config"
+++ "b/CC/iWareCC_ASRS/App - \346\234\254\346\234\272.config"
@@ -16,7 +16,7 @@
</entityFramework>
<appSettings>
<!-- 鏄惁妯℃嫙PLC锛屽彂甯冧竴瀹氭槸 FALSE -->
- <add key="IsSimulationPLC" value="true"/>
+ <add key="IsSimulationPLC" value="false"/>
<!-- 鏄惁鏄殢鏈哄鎵惧簱浣嶏紝寤鸿鏄痜alse-->
<add key="IsRandomFindPlace" value="false"/>
<!-- 瑗挎腐WMS鐨凙PI-->
diff --git "a/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config" "b/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config"
index fb1752a..b3a9dbf 100644
--- "a/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config"
+++ "b/CC/iWareCC_ASRS/App - \346\255\243\345\274\217.config"
@@ -16,7 +16,7 @@
</entityFramework>
<appSettings>
<!-- 鏄惁妯℃嫙PLC锛屽彂甯冧竴瀹氭槸 FALSE -->
- <add key="IsSimulationPLC" value="true"/>
+ <add key="IsSimulationPLC" value="false"/>
<!-- 鏄惁鏄殢鏈哄鎵惧簱浣嶏紝寤鸿鏄痜alse-->
<add key="IsRandomFindPlace" value="false"/>
<!-- 瑗挎腐WMS鐨凙PI-->
diff --git a/CC/iWareCC_ASRS/App.config b/CC/iWareCC_ASRS/App.config
index f40abba..73b7e3a 100644
--- a/CC/iWareCC_ASRS/App.config
+++ b/CC/iWareCC_ASRS/App.config
@@ -16,7 +16,7 @@
</entityFramework>
<appSettings>
<!-- 鏄惁妯℃嫙PLC锛屽彂甯冧竴瀹氭槸 FALSE -->
- <add key="IsSimulationPLC" value="true"/>
+ <add key="IsSimulationPLC" value="false"/>
<!-- 鏄惁鏄殢鏈哄鎵惧簱浣嶏紝寤鸿鏄痜alse-->
<add key="IsRandomFindPlace" value="false"/>
<!-- 瑗挎腐WMS鐨凙PI-->
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 47d2b1a..c45661a 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -301,7 +301,7 @@
}
else
{//姝ｅ紡妯″紡
- rgvServiceClient = new RgvServiceClient();
+ stationServiceClient = new StationServiceClient();
}
this.lbl_IsSimulationPLC.BackColor = IsSimulationPLC ? Color.Red : Color.Green;
diff --git a/CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs b/CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs
index e8f37f5..3540074 100644
--- a/CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs
+++ b/CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs
@@ -12,6 +12,12 @@
public enum AreaCodeEnum
{
/// <summary>
+ /// 鏃犲尯鍩�
+ /// </summary>
+ [Description("鏃犲尯鍩�")]
+ 鏃犲尯鍩� = 0,
+
+ /// <summary>
/// 寰呯紦瀛樺垎鎷ｅ尯
/// </summary>
[Description("寰呯紦瀛樺垎鎷ｅ尯")]
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
index 3393d9a..a79861a 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
@@ -47,8 +47,8 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
- <el-form-item label="閮ㄤ欢鏉＄爜" prop="uPI">
- <el-input v-model="ruleForm.uPI" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
+ <el-form-item label="閮ㄤ欢鏉＄爜" prop="upi">
+ <el-input v-model="ruleForm.upi" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
</el-form-item>
@@ -233,7 +233,7 @@
upiStatus: [{required: true, message: '璇烽�夋嫨鏉挎枡鐘舵�侊紒', trigger: 'change',},],
planNo: [{required: true, message: '璇疯緭鍏ユ壒娆″彿锛�', trigger: 'blur',},],
orderId: [{required: true, message: '璇疯緭鍏ヨ鍗曞彿锛�', trigger: 'blur',},],
- uPI: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
+ upi: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
detailName: [{required: true, message: '璇疯緭鍏ラ儴浠跺悕绉帮紒', trigger: 'blur',},],
length: [{required: true, message: '璇疯緭鍏ラ暱锛�', trigger: 'blur',},],
width: [{required: true, message: '璇疯緭鍏ュ锛�', trigger: 'blur',},],
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
index 42ad58c..29478a2 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
@@ -41,7 +41,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
<el-form-item label="閮ㄤ欢鏉＄爜">
- <el-input v-model="queryParamsMes_BatchOrderUPI_New.uPI" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
+ <el-input v-model="queryParamsMes_BatchOrderUPI_New.upi" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
</el-form-item>
</el-col>
@@ -199,7 +199,7 @@
</el-table-column>
<el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
<el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="uPI" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
+ <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
<el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
<el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
<el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Admin.NET.Application.csproj b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Admin.NET.Application.csproj
index aa162ae..9a21643 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Admin.NET.Application.csproj
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Admin.NET.Application.csproj
@@ -25,6 +25,11 @@
</ItemGroup>
<ItemGroup>
+ <None Remove="Configuration\Database - 鏈満.json" />
+ <None Remove="Configuration\Database - 姝ｅ紡.json" />
+ </ItemGroup>
+
+ <ItemGroup>
<ProjectReference Include="..\Admin.NET.Core\Admin.NET.Core.csproj" />
<ProjectReference Include="..\Plugins\Admin.NET.Plugin.ApprovalFlow\Admin.NET.Plugin.ApprovalFlow.csproj" />
<ProjectReference Include="..\Plugins\Admin.NET.Plugin.DingTalk\Admin.NET.Plugin.DingTalk.csproj" />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs
index 291e835..96932b4 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs
@@ -8,6 +8,13 @@
[Description("鍖哄煙缂栫爜鏋氫妇")]
public enum AreaCodeEnum
{
+
+ /// <summary>
+ /// 鏃犲尯鍩�
+ /// </summary>
+ [Description("鏃犲尯鍩�")]
+ 鏃犲尯鍩� = 0,
+
/// <summary>
/// 寰呯紦瀛樺垎鎷ｅ尯
/// </summary>
diff --git a/SDA/iWareModel/EnumType/EDevice/EDevice.cs b/SDA/iWareModel/EnumType/EDevice/EDevice.cs
index 3eeddcc..66dc083 100644
--- a/SDA/iWareModel/EnumType/EDevice/EDevice.cs
+++ b/SDA/iWareModel/EnumType/EDevice/EDevice.cs
@@ -17,6 +17,8 @@
鍥涘彿鍫嗗灈鏈� = 4,
RGV = 5,
+ Station = 6,
+
鍏ュ簱鍙�1015 = 1015,
鍏ュ簱鍙�1019 = 1019,
@@ -46,8 +48,5 @@
//AGV = 1019,
AGV = 1099,
-
-
- Station = 7777
}
}
diff --git a/SDA/iWareSda/App.config b/SDA/iWareSda/App.config
index e27eb40..e4067c0 100644
--- a/SDA/iWareSda/App.config
+++ b/SDA/iWareSda/App.config
@@ -4,7 +4,8 @@
<!-- 璇█閰嶇疆 閰嶇疆 0 涓枃 1 鑻辨枃 -->
<add key="LanguageFlg" value="0"/>
<!-- 绔欑偣鐨凱LC 閰嶇疆 -->
- <add key="Station_Address" value="172.17.51.202"/>
+ <!-- <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/Common/SdaHelper.cs b/SDA/iWareSda/Common/SdaHelper.cs
index d0f3e1e..3b853ee 100644
--- a/SDA/iWareSda/Common/SdaHelper.cs
+++ b/SDA/iWareSda/Common/SdaHelper.cs
@@ -43,7 +43,14 @@
}
else
{
- proValues = t1_pro.GetValue(t1, null).ToString();
+ if (t1_pro.GetValue(t1, null) == null)
+ {
+ proValues = "";
+ }
+ else
+ {
+ proValues = t1_pro.GetValue(t1, null).ToString();
+ }
arr = proValues.Split(WareSdaStruct.PLCDBADDRESS_SEPARATE);
if (arr.Length != 2)
{
diff --git a/SDA/iWareSda/Common/Struct/WareSdaStruct.cs b/SDA/iWareSda/Common/Struct/WareSdaStruct.cs
index abac5b2..bc05fef 100644
--- a/SDA/iWareSda/Common/Struct/WareSdaStruct.cs
+++ b/SDA/iWareSda/Common/Struct/WareSdaStruct.cs
@@ -97,10 +97,9 @@
/// 绔欑偣闆嗗悎
/// </summary>
public static List<string> StationStationList = new List<string>() {
- "1001","1002","1003","1004","1005","1006","1007","1008","1009","1010",
- "1011","1012","1013","1014","1015",
- "1020","1030","1040", //鎷嗙洏鏈� 鎻愬崌鏈� RGV
- "1019"
+ StationLocationEnum.棣栨鎵爜宸ヤ綅.ToString(),
+ StationLocationEnum.BZ01.ToString(),
+ StationLocationEnum.BZ39.ToString(),
};
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index a03aaca..5740ee1 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -28,7 +28,7 @@
/// 榻愬淇℃伅锛�998榻愬锛�999寮傚父鍑哄簱锛�
/// </summary>
[Description("榻愬淇℃伅锛�998榻愬锛�999寮傚父鍑哄簱锛�")]
- public string W_KittingInfo { get; set; }
+ public short W_KittingInfo { get; set; }
/// <summary>
/// 鍒嗛厤鏀炬枡搴撲綅鍙�
@@ -175,7 +175,7 @@
public string W_Inbound_TaskID { get; set; }
-
+
/// <summary>
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
index d61a45d..7cd2b86 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -195,13 +195,7 @@
var stationObj = this.DBBlockForWrite.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();
var view_stationObj = this.View.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();
- MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
- if (!b2.result)
- {
- msg = string.Format("鍚慡tation鍦板潃{0} 鍐� " + true + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
- stationObj.W_DataFinish);
- return false;
- }
+
int i_result = 0;
if (value)
{
@@ -211,13 +205,22 @@
{
i_result = 999;
}
- b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
+ MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
if (!b2.result)
{
msg = string.Format("鍚慡tation鍦板潃{0} 鍐� " + value + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
stationObj.W_DataFinish);
return false;
}
+
+ b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
+ if (!b2.result)
+ {
+ msg = string.Format("鍚慡tation鍦板潃{0} 鍐� " + true + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
+ stationObj.W_DataFinish);
+ return false;
+ }
+
return true;
}
catch (Exception ex)
diff --git a/SDA/iWareSda/PLCService/Default/Siemens_HslCommunicationService.cs b/SDA/iWareSda/PLCService/Default/Siemens_HslCommunicationService.cs
index 90684fb..9b51075 100644
--- a/SDA/iWareSda/PLCService/Default/Siemens_HslCommunicationService.cs
+++ b/SDA/iWareSda/PLCService/Default/Siemens_HslCommunicationService.cs
@@ -144,6 +144,10 @@
public override MessageModel WriteValuePoint(string fullAddress, object value, object proObj)
{
+ if (string.IsNullOrEmpty(fullAddress))
+ {
+ return new MessageModel() { result = false, resMsg = "鍦板潃涓虹┖" };
+ }
var arr = fullAddress.Split(WareSdaStruct.PLCDBADDRESS_SEPARATE);
string dbNumber = arr[0];
string offset = arr[1];
--
Gitblit v1.9.3