From 1faef6894400be9923b24038fddb7f9218bd7b6b Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 30 三月 2026 18:19:16 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs | 73 +--
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 67 +++
Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs | 8
Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/AGVTaskDto.cs | 636 ++++++++++++++++++++++++++++++
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 422 ++++++++++++++++++++
Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 44 ++
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 5
Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue | 4
8 files changed, 1,203 insertions(+), 56 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue
index f8fed3d..006847a 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue
@@ -48,7 +48,7 @@
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
],
[
- { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
+ { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskTypeEnum",data: [],},
{ title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
{ title: "宸烽亾鍙�", field: "roadway", type: "like" },
],
@@ -96,7 +96,7 @@
type: "int",
width: 120,
align: "left",
- bind: { key: "taskType", data: [] },
+ bind: { key: "taskTypeEnum", data: [] },
},
{
field: "taskStatus",
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs
index 67446d8..e8e8a64 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs
@@ -19,15 +19,15 @@
Undefined = 0,
/// <summary>
- /// 灏忔墭鐩�
+ /// 妯″垏娈�
/// </summary>
- [Description("灏忔墭鐩�")]
+ [Description("妯″垏娈�")]
SmallPallet = 1,
/// <summary>
- /// 涓墭鐩�
+ /// 鍗风粫娈�
/// </summary>
- [Description("涓墭鐩�")]
+ [Description("鍗风粫娈�")]
MediumPallet = 2,
/// <summary>
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs
index 7685dce..132dd2e 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs
@@ -9,68 +9,45 @@
{
/// <summary>
/// 浠撳簱
- /// HA57 = 娣畨浜屽巶 - 鏉挎枡浠�<br/>
- /// HA58 = 娣畨浜屽巶 - PP浠�<br/>
- /// HA60 = 娣畨浜屽巶 - 杈呮枡浠�<br/>
- /// HA64 = 娣畨浜屽巶 - 娴嬭瘯鏋朵粨<br/>
- /// HA71 = 娣畨浜屽巶 - 鎴愬搧浠�<br/>
- /// HA72 = 娣畨浜屽巶 - 灏炬暟浠�<br/>
- /// HA73 = 娣畨浜屽巶 - 鐮斿彂浠�<br/>
- /// HA101 = 娣畨浜屽巶 - 鎴愬搧浠撳钩搴�<br/>
- /// HA152 = 娣畨浜屽巶 - 骞茶啘浠�<br/>
- /// HA153 = 娣畨浜屽巶 - 娌瑰ⅷ浠�<br/>
+ /// GW1 = 闄曠叅浜屽巶 - 楂樻俯1鍙蜂粨搴�<br/>
+ /// CW1 = 闄曠叅浜屽巶 - 甯告俯1鍙蜂粨搴�<br/>
+ /// HCFR1 = 闄曠叅浜屽巶 - 鍒嗗1鍙蜂粨搴�<br/>
+ /// GW2 = 闄曠叅浜屽巶 - 楂樻俯2鍙蜂粨搴�<br/>
+ /// ZJ1 = 闄曠叅浜屽巶 - 姝ｆ瀬鍗蜂粨<br/>
+ /// FJ1 = 闄曠叅浜屽巶 - 璐熸瀬鍗蜂粨<br/>
+
/// </summary>
public enum WarehouseEnum
{
/// <summary>
- /// 鏉挎枡浠�
+ /// 楂樻俯1鍙蜂粨搴�
/// </summary>
- [Description("鏉挎枡浠�")]
- HA57,
+ [Description("楂樻俯1鍙蜂粨搴�")]
+ GW1 = 1,
/// <summary>
- /// PP浠�
+ /// 甯告俯1鍙蜂粨搴�
/// </summary>
- [Description("PP浠�")]
- HA58,
+ [Description("甯告俯1鍙蜂粨搴�")]
+ CW1 = 2,
/// <summary>
- /// 杈呮枡浠�
+ /// 鍒嗗1鍙蜂粨搴�
/// </summary>
- [Description("杈呮枡浠�")]
- HA60,
+ [Description("鍒嗗1鍙蜂粨搴�")]
+ HCFR1 = 3,
/// <summary>
- /// 娴嬭瘯鏋朵粨
+ /// 楂樻俯2鍙蜂粨搴�
/// </summary>
- [Description("娴嬭瘯鏋朵粨")]
- HA64,
+ [Description("楂樻俯2鍙蜂粨搴�")]
+ GW2 = 4,
/// <summary>
- /// 鎴愬搧浠�
+ /// 姝ｆ瀬鍗蜂粨
/// </summary>
- [Description("鎴愬搧浠�")]
- HA71,
+ [Description("姝ｆ瀬鍗蜂粨")]
+ ZJ1 = 5,
/// <summary>
- /// 灏炬暟浠�
+ /// 璐熸瀬鍗蜂粨
/// </summary>
- [Description("灏炬暟浠�")]
- HA72,
- /// <summary>
- /// 鐮斿彂浠�
- /// </summary>
- [Description("鐮斿彂浠�")]
- HA73,
- /// <summary>
- /// 鎴愬搧浠撳钩搴�
- /// </summary>
- [Description("鎴愬搧浠撳钩搴�")]
- HA101,
- /// <summary>
- /// 骞茶啘浠�
- /// </summary>
- [Description("骞茶啘浠�")]
- HA152,
- /// <summary>
- /// 娌瑰ⅷ浠�
- /// </summary>
- [Description("娌瑰ⅷ浠�")]
- HA153
+ [Description("璐熸瀬鍗蜂粨")]
+ FJ1 = 6
}
}
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/AGVTaskDto.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/AGVTaskDto.cs
new file mode 100644
index 0000000..ebe9670
--- /dev/null
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/AGVTaskDto.cs
@@ -0,0 +1,636 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace WIDESEA_DTO.Task
+{
+ public class AGVResponse
+ {
+ /// <summary>
+ /// 璇锋眰缁撴灉浠ｇ爜 - 蹇呭～锛宼rue鎴愬姛锛宖alse澶辫触
+ /// </summary>
+ public bool Code { get; set; }
+
+ /// <summary>
+ /// 璇锋眰缁撴灉璇存槑 - 閫夊～锛屾槸鍚︽垚鍔燂紝鎴愬姛杩斿洖绌猴紝寮傚父杩斿洖寮傚父淇℃伅
+ /// </summary>
+ public string Msg { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍙ｇ紪鍙� - 閫夊～
+ /// </summary>
+ public string Devid { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏鍙� - 閫夊～
+ /// </summary>
+ public string Traynumber { get; set; }
+
+ /// <summary>
+ /// 鏁存墭缁勫埆-鍘氬害 - 閫夊～
+ /// </summary>
+ public string Group { get; set; }
+
+ /// <summary>
+ /// 瀹藉害 - 閫夊～
+ /// </summary>
+ public int? Width { get; set; }
+
+ /// <summary>
+ /// 鏁版嵁鍒楄〃 - 閫夊～
+ /// </summary>
+ public List<string> Data { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鍙� - 閫夊～
+ /// </summary>
+ public string Labelnumber { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜 - 閫夊～
+ /// </summary>
+ public string Productno { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鎻忚堪 - 閫夊～
+ /// </summary>
+ public string Productname { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺 - 閫夊～
+ /// </summary>
+ public string Quantity { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅 - 閫夊～
+ /// </summary>
+ public string Uomcode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷 - 閫夊～
+ /// </summary>
+ public string Producttype { get; set; }
+
+ /// <summary>
+ /// 浜у嚭璁惧 - 閫夊～
+ /// </summary>
+ public string Equipment { get; set; }
+
+ /// <summary>
+ /// 浜у嚭鏃堕棿 - 閫夊～
+ /// </summary>
+ public string Productiondate { get; set; }
+
+ /// <summary>
+ /// 涓嬮檺鏃堕棿 - 閫夊～
+ /// </summary>
+ public string Lowerlimittime { get; set; }
+
+ /// <summary>
+ /// 棰勮鏃堕棿 - 閫夊～
+ /// </summary>
+ public string Warningtime { get; set; }
+
+ /// <summary>
+ /// 瓒呮湡鏃堕棿 - 閫夊～
+ /// </summary>
+ public string Overduetime { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�1 - 閫夊～
+ /// </summary>
+ public string Define1 { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�2 - 閫夊～
+ /// </summary>
+ public string Define2 { get; set; }
+
+ public AGVResponse OK(AGVDataDto aGVDataDto = null)
+ {
+ Msg = "";
+ Code = true;
+ if (aGVDataDto != null)
+ {
+ // 灏咥GVDataDto鐨勫睘鎬ц祴鍊肩粰AGVResponse
+ Devid = aGVDataDto.DevId;
+ Traynumber = aGVDataDto.TrayNumber;
+ Group = aGVDataDto.Group;
+ Width = aGVDataDto.Width;
+ Data = aGVDataDto.Data;
+ Labelnumber = aGVDataDto.LabelNumber;
+ Productno = aGVDataDto.ProductNo;
+ Productname = aGVDataDto.ProductName;
+ Quantity = aGVDataDto.Quantity;
+ Uomcode = aGVDataDto.UomCode;
+ Producttype = aGVDataDto.ProductType;
+ Equipment = aGVDataDto.Equipment;
+ Productiondate = aGVDataDto.ProductionDate;
+ Lowerlimittime = aGVDataDto.LowerLimitTime;
+ Warningtime = aGVDataDto.WarningTime;
+ Overduetime = aGVDataDto.OverdueTime;
+ Define1 = aGVDataDto.Define1;
+ Define2 = aGVDataDto.Define2;
+ }
+ return this;
+ }
+ public AGVResponse Error(string msg)
+ {
+ Msg = msg;
+ Code = false;
+ return this;
+ }
+ }
+ /// <summary>
+ /// AGV鍝嶅簲鏁版嵁椤�
+ /// </summary>
+ /// <summary>
+ /// AGV鏁版嵁DTO
+ /// </summary>
+ public class AGVDataDto
+ {
+ /// <summary>
+ /// 鍏ュ簱鍙ｇ紪鍙� - 閫夊～
+ /// </summary>
+ [JsonPropertyName("devid")]
+ [StringLength(50, ErrorMessage = "鍏ュ簱鍙ｇ紪鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string DevId { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏鍙� - 閫夊～
+ /// </summary>
+ [JsonPropertyName("traynumber")]
+ [StringLength(50, ErrorMessage = "鎵樼洏鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string TrayNumber { get; set; }
+
+ /// <summary>
+ /// 鏁存墭缁勫埆-鍘氬害 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("group")]
+ [StringLength(50, ErrorMessage = "鏁存墭缁勫埆闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Group { get; set; }
+
+ /// <summary>
+ /// 瀹藉害 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("width")]
+ public int? Width { get; set; }
+
+ /// <summary>
+ /// 鏁版嵁鍒楄〃 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("data")]
+ public List<string> Data { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鍙� - 閫夊～
+ /// </summary>
+ [JsonPropertyName("labelnumber")]
+ [StringLength(50, ErrorMessage = "鏉＄爜鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string LabelNumber { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("productno")]
+ [StringLength(50, ErrorMessage = "鐗╂枡缂栫爜闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ProductNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鎻忚堪 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("productname")]
+ [StringLength(50, ErrorMessage = "鐗╂枡鎻忚堪闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ProductName { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("quantity")]
+ [StringLength(50, ErrorMessage = "鏁伴噺闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Quantity { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("uomcode")]
+ [StringLength(50, ErrorMessage = "鍗曚綅闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string UomCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("producttype")]
+ [StringLength(50, ErrorMessage = "鐗╂枡绫诲瀷闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ProductType { get; set; }
+
+ /// <summary>
+ /// 浜у嚭璁惧 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("equipment")]
+ [StringLength(50, ErrorMessage = "浜у嚭璁惧闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Equipment { get; set; }
+
+ /// <summary>
+ /// 浜у嚭鏃堕棿 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("productiondate")]
+ [StringLength(50, ErrorMessage = "浜у嚭鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ProductionDate { get; set; }
+
+ /// <summary>
+ /// 涓嬮檺鏃堕棿 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("lowerlimittime")]
+ [StringLength(50, ErrorMessage = "涓嬮檺鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string LowerLimitTime { get; set; }
+
+ /// <summary>
+ /// 棰勮鏃堕棿 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("warningtime")]
+ [StringLength(50, ErrorMessage = "棰勮鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string WarningTime { get; set; }
+
+ /// <summary>
+ /// 瓒呮湡鏃堕棿 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("overduetime")]
+ [StringLength(50, ErrorMessage = "瓒呮湡鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string OverdueTime { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�1 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("define1")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�1闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Define1 { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�2 - 閫夊～
+ /// </summary>
+ [JsonPropertyName("define2")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�2闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Define2 { get; set; }
+ }
+ /// <summary>
+ /// 浠诲姟鍒涘缓鏁版嵁浼犺緭瀵硅薄
+ /// </summary>
+ public class ApplyInOutDto
+ {
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [JsonPropertyName("taskid")]
+ [Required(ErrorMessage = "浠诲姟鍙蜂笉鑳戒负绌�")]
+ [StringLength(50, ErrorMessage = "浠诲姟鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string TaskId { get; set; }
+
+ /// <summary>
+ /// 1-妯″垏娈碉紱2-鍗风粫娈�
+ /// </summary>
+ [JsonPropertyName("floor")]
+ [Required(ErrorMessage = "妤煎眰娈典笉鑳戒负绌�")]
+ [Range(1, 2, ErrorMessage = "妤煎眰娈靛�煎繀椤绘槸1鎴�2")]
+ public int Floor { get; set; }
+
+ /// <summary>
+ /// 1-闃存瀬锛�2-闃虫瀬
+ /// </summary>
+ [JsonPropertyName("yinyang")]
+ [Required(ErrorMessage = "闃撮槼鏋佷笉鑳戒负绌�")]
+ [Range(1, 2, ErrorMessage = "闃撮槼鏋佸�煎繀椤绘槸1鎴�2")]
+ public int YinYang { get; set; }
+
+ /// <summary>
+ /// 1-鍏ュ簱锛�2-鍑哄簱
+ /// </summary>
+ [JsonPropertyName("inout")]
+ [Required(ErrorMessage = "鍑哄叆搴撶被鍨嬩笉鑳戒负绌�")]
+ [Range(1, 2, ErrorMessage = "鍑哄叆搴撶被鍨嬪�煎繀椤绘槸1鎴�2")]
+ public int InOut { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ [JsonPropertyName("materialtype")]
+ [Required(ErrorMessage = "鐗╂枡绫诲瀷涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "鐗╂枡绫诲瀷闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string MaterialType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鎻忚堪
+ /// </summary>
+ [JsonPropertyName("materialname")]
+ [Required(ErrorMessage = "鐗╂枡鎻忚堪涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "鐗╂枡鎻忚堪闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ [JsonPropertyName("traynumber")]
+ [StringLength(50, ErrorMessage = "鎵樼洏鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string TrayNumber { get; set; }
+
+ /// <summary>
+ /// 鏁存墭缁勫埆-鍘氬害
+ /// </summary>
+ [JsonPropertyName("group")]
+ [StringLength(50, ErrorMessage = "鏁存墭缁勫埆闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Group { get; set; }
+
+ /// <summary>
+ /// 瀹藉害
+ /// </summary>
+ [JsonPropertyName("width")]
+ public int? Width { get; set; }
+
+ /// <summary>
+ /// 鏁版嵁闆嗗悎
+ /// </summary>
+ [JsonPropertyName("data")]
+ public List<string> Data { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鍙�
+ /// </summary>
+ [JsonPropertyName("labelnumber")]
+ [StringLength(50, ErrorMessage = "鏉＄爜鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string LabelNumber { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [JsonPropertyName("productno")]
+ [StringLength(50, ErrorMessage = "鐗╂枡缂栫爜闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ProductNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鎻忚堪
+ /// </summary>
+ [JsonPropertyName("productname")]
+ [StringLength(50, ErrorMessage = "鐗╂枡鎻忚堪闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ProductName { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [JsonPropertyName("quantity")]
+ [StringLength(50, ErrorMessage = "鏁伴噺闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Quantity { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [JsonPropertyName("uomcode")]
+ [StringLength(50, ErrorMessage = "鍗曚綅闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string UomCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ [JsonPropertyName("producttype")]
+ [StringLength(50, ErrorMessage = "鐗╂枡绫诲瀷闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ProductType { get; set; }
+
+ /// <summary>
+ /// 浜у嚭璁惧
+ /// </summary>
+ [JsonPropertyName("equipment")]
+ [StringLength(50, ErrorMessage = "浜у嚭璁惧闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Equipment { get; set; }
+
+ /// <summary>
+ /// 浜у嚭鏃堕棿
+ /// </summary>
+ [JsonPropertyName("productiondate")]
+ [StringLength(50, ErrorMessage = "浜у嚭鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ProductionDate { get; set; }
+
+ /// <summary>
+ /// 涓嬮檺鏃堕棿
+ /// </summary>
+ [JsonPropertyName("lowerlimittime")]
+ [StringLength(50, ErrorMessage = "涓嬮檺鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string LowerLimitTime { get; set; }
+
+ /// <summary>
+ /// 棰勮鏃堕棿
+ /// </summary>
+ [JsonPropertyName("warningtime")]
+ [StringLength(50, ErrorMessage = "棰勮鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string WarningTime { get; set; }
+
+ /// <summary>
+ /// 瓒呮湡鏃堕棿
+ /// </summary>
+ [JsonPropertyName("overduetime")]
+ [StringLength(50, ErrorMessage = "瓒呮湡鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string OverdueTime { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�1
+ /// </summary>
+ [JsonPropertyName("define1")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�1闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Define1 { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�2
+ /// </summary>
+ [JsonPropertyName("define2")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�2闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Define2 { get; set; }
+
+ /// <summary>
+ /// 璇锋眰鏃堕棿
+ /// </summary>
+ [JsonPropertyName("reqtime")]
+ [Required(ErrorMessage = "璇锋眰鏃堕棿涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "璇锋眰鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ReqTime { get; set; }
+ }
+ /// <summary>
+ /// 杈撻�佺嚎鐢宠杩涘叆璇锋眰妯″瀷
+ /// </summary>
+ public class ApplyEnterDto
+ {
+ /// <summary>
+ /// 璁惧ID
+ /// </summary>
+ [JsonPropertyName("devid")]
+ [Required(ErrorMessage = "璁惧ID涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "璁惧ID闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string DevId { get; set; }
+
+ /// <summary>
+ /// 鍑哄叆搴撶被鍨� 1-鍏ュ簱锛�2-鍑哄簱
+ /// </summary>
+ [JsonPropertyName("inout")]
+ [Required(ErrorMessage = "鍑哄叆搴撶被鍨嬩笉鑳戒负绌�")]
+ [Range(1, 2, ErrorMessage = "鍑哄叆搴撶被鍨嬪�煎繀椤绘槸1鎴�2")]
+ public int InOut { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [JsonPropertyName("taskid")]
+ [Required(ErrorMessage = "浠诲姟鍙蜂笉鑳戒负绌�")]
+ [StringLength(50, ErrorMessage = "浠诲姟鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string TaskId { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�1
+ /// </summary>
+ [JsonPropertyName("define1")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�1闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Define1 { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�2
+ /// </summary>
+ [JsonPropertyName("define2")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�2闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string Define2 { get; set; }
+
+ /// <summary>
+ /// 璇锋眰鏃堕棿
+ /// </summary>
+ [JsonPropertyName("reqtime")]
+ [Required(ErrorMessage = "璇锋眰鏃堕棿涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "璇锋眰鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ReqTime { get; set; }
+ }
+ /// <summary>
+ /// 鍑哄簱瀹屾垚鍙嶉
+ /// </summary>
+ public class OutTaskCompleteDto
+ {
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [JsonPropertyName("taskid")]
+ [Required(ErrorMessage = "浠诲姟鍙蜂笉鑳戒负绌�")]
+ [StringLength(50, ErrorMessage = "浠诲姟鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string TaskId { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍙ｇ紪鍙�
+ /// </summary>
+ [JsonPropertyName("devid")]
+ [Required(ErrorMessage = "鍑哄簱鍙ｇ紪鍙蜂笉鑳戒负绌�")]
+ [StringLength(50, ErrorMessage = "鍑哄簱鍙ｇ紪鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string DevId { get; set; }
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�1
+ /// </summary>
+ [JsonPropertyName("define1")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�1闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string? Define1 { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�2
+ /// </summary>
+ [JsonPropertyName("define2")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�2闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string? Define2 { get; set; }
+
+ /// <summary>
+ /// 璇锋眰鏃堕棿
+ /// </summary>
+ [JsonPropertyName("reqtime")]
+ [Required(ErrorMessage = "璇锋眰鏃堕棿涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "璇锋眰鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ReqTime { get; set; }
+ }
+ /// <summary>
+ /// 鍙栨斁璐у畬鎴愯姹傛ā鍨�
+ /// </summary>
+ public class TaskCompleteDto
+ {
+ /// <summary>
+ /// 璁惧ID
+ /// </summary>
+ [JsonPropertyName("devid")]
+ [Required(ErrorMessage = "璁惧ID涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "璁惧ID闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string DevId { get; set; }
+
+ /// <summary>
+ /// 鍑哄叆搴撶被鍨� 1-鍏ュ簱锛�2-鍑哄簱
+ /// </summary>
+ [JsonPropertyName("inout")]
+ [Required(ErrorMessage = "鍑哄叆搴撶被鍨嬩笉鑳戒负绌�")]
+ [Range(1, 2, ErrorMessage = "鍑哄叆搴撶被鍨嬪�煎繀椤绘槸1鎴�2")]
+ public int InOut { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [JsonPropertyName("taskid")]
+ [Required(ErrorMessage = "浠诲姟鍙蜂笉鑳戒负绌�")]
+ [StringLength(50, ErrorMessage = "浠诲姟鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string TaskId { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�1
+ /// </summary>
+ [JsonPropertyName("define1")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�1闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string? Define1 { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�2
+ /// </summary>
+ [JsonPropertyName("define2")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�2闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string? Define2 { get; set; }
+
+ /// <summary>
+ /// 璇锋眰鏃堕棿
+ /// </summary>
+ [JsonPropertyName("reqtime")]
+ [Required(ErrorMessage = "璇锋眰鏃堕棿涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "璇锋眰鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ReqTime { get; set; }
+ }
+
+ /// <summary>
+ /// 浠诲姟鍙栨秷鏁版嵁浼犺緭瀵硅薄
+ /// </summary>
+ public class TaskCancelDto
+ {
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [JsonPropertyName("taskid")]
+ [Required(ErrorMessage = "浠诲姟鍙蜂笉鑳戒负绌�")]
+ [StringLength(50, ErrorMessage = "浠诲姟鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�")]
+ public string TaskId { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�1
+ /// </summary>
+ [JsonPropertyName("define1")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�1闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string? Define1 { get; set; }
+
+ /// <summary>
+ /// 棰勭暀鑷畾涔夊瓧娈�2
+ /// </summary>
+ [JsonPropertyName("define2")]
+ [StringLength(50, ErrorMessage = "鑷畾涔夊瓧娈�2闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string? Define2 { get; set; }
+
+ /// <summary>
+ /// 璇锋眰鏃堕棿
+ /// </summary>
+ [JsonPropertyName("reqtime")]
+ [Required(ErrorMessage = "璇锋眰鏃堕棿涓嶈兘涓虹┖")]
+ [StringLength(50, ErrorMessage = "璇锋眰鏃堕棿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")]
+ public string ReqTime { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs
index eda9d5f..f78aafe 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs
@@ -154,5 +154,49 @@
/// <param name="stock"></param>
/// <returns></returns>
Task<WebResponseContent> CreateRobotChangePalletTaskAsync(StockDTO stock);
+
+
+ #region 鏋佸嵎搴撲换鍔℃ā鍧�
+ /// <summary>
+ /// 鍑哄叆搴撶敵璇�
+ /// </summary>
+ /// <param name="applyInOutDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public Task<AGVResponse> ApplyInOutAsync(ApplyInOutDto applyInOutDto);
+
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
+ /// </summary>
+ /// <param name="outTaskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public Task<WebResponseContent> OutTaskComplete(OutTaskCompleteDto outTaskCompleteDto);
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚鎺ュ彛
+ /// </summary>
+ /// <param name="wCSTask"></param>
+ /// <returns></returns>
+ //public Task<WebResponseContent> TaskCompleted(WCSTaskDTO wCSTask);
+
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskCancelDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public Task<AGVResponse> TaskCancelAsync(TaskCancelDto taskCancelDto);
+ /// <summary>
+ /// 鍙栨斁璐у畬鎴�
+ /// </summary>
+ /// <param name="taskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public Task<AGVResponse> TaskCompleteAsync(TaskCompleteDto taskCompleteDto);
+ /// <summary>
+ /// 杈撻�佺嚎鐢宠杩涘叆
+ /// </summary>
+ /// <param name="applyEnterDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public Task<AGVResponse> ApplyEnterAsync(ApplyEnterDto applyEnterDto);
+
+ #endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
}
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 085d132..4ac879d 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -2,14 +2,17 @@
using MapsterMapper;
using Microsoft.Extensions.Configuration;
using SqlSugar;
+using System.DirectoryServices.Protocols;
using System.Text.Json;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Core;
+using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.GradingMachine;
using WIDESEA_DTO.MES;
@@ -33,6 +36,7 @@
private readonly IMesService _mesService;
private readonly ITask_HtyService _task_HtyService;
private readonly IStockInfo_HtyService _stockInfo_HtyService;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -55,7 +59,8 @@
RoundRobinService roundRobinService,
IMesService mesService,
ITask_HtyService task_HtyService,
- IStockInfo_HtyService stockInfo_HtyService) : base(BaseDal)
+ IStockInfo_HtyService stockInfo_HtyService,
+ IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
@@ -66,6 +71,7 @@
_mesService = mesService;
_task_HtyService = task_HtyService;
_stockInfo_HtyService = stockInfo_HtyService;
+ _unitOfWorkManage = unitOfWorkManage;
}
#region WCS閫昏緫澶勭悊
@@ -222,6 +228,12 @@
var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+ // 鍒ゆ柇鏄笉鏄瀬鍗峰簱浠诲姟
+ //if (taskDto.WarehouseId == (int)WarehouseEnum.FJ1 || taskDto.WarehouseId == (int)WarehouseEnum.ZJ1)
+ //{
+ // return WebResponseContent.Instance.OK();
+ //}
+
return await ExecuteWithinTransactionAsync(async () =>
{
WebResponseContent content = new WebResponseContent();
@@ -278,6 +290,18 @@
var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+ // 鍒ゆ柇鏄笉鏄瀬鍗峰簱浠诲姟
+ if (taskDto.WarehouseId == (int)WarehouseEnum.FJ1 || taskDto.WarehouseId == (int)WarehouseEnum.ZJ1)
+ {
+ OutTaskCompleteDto outTaskCompleteDto = new OutTaskCompleteDto()
+ {
+ TaskId = task.OrderNo,
+ DevId = task.TargetAddress,
+ ReqTime = DateTime.Now.ToString()
+ };
+ return await OutTaskComplete(outTaskCompleteDto);
+ }
WebResponseContent content = new WebResponseContent();
return await ExecuteWithinTransactionAsync(async () =>
@@ -1096,5 +1120,401 @@
}
#endregion 鍒嗗鏌滄帴鍙�
+
+
+ #region 鏋佸嵎搴撲换鍔℃ā鍧�
+ public string AGV_OutTaskComplete = WIDESEA_Core.Helper.AppSettings.Configuration["AGV_OutTaskComplete"]; // 涓婃姤AGV鍑哄簱杈撻�佺嚎瀹屾垚
+ public string WCS_ReceiveTask = WIDESEA_Core.Helper.AppSettings.Configuration["WCS_ReceiveTask"]; // WMS杈撻�佺嚎浠诲姟涓嬪彂
+ /// <summary>
+ /// 鍑哄叆搴撶敵璇�
+ /// </summary>
+ /// <param name="applyInOutDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<AGVResponse> ApplyInOutAsync(ApplyInOutDto applyInOutDto)
+ {
+ AGVResponse aGVResponse = new AGVResponse();
+ try
+ {
+ // 鍙傛暟楠岃瘉
+ if (applyInOutDto == null) return aGVResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.TrayNumber)) return aGVResponse.Error("鎵樼洏鍙蜂笉鑳戒负绌�");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.TaskId)) return aGVResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.MaterialType)) return aGVResponse.Error("鐗╂枡绫诲瀷涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.MaterialName)) return aGVResponse.Error("鐗╂枡鎻忚堪涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.ReqTime)) return aGVResponse.Error("璇锋眰鏃堕棿涓嶈兘涓虹┖");
+ if (applyInOutDto.Floor != 1 && applyInOutDto.Floor != 2) return aGVResponse.Error($"妤煎眰娈甸敊璇紝蹇呴』涓�1(妯″垏娈�)鎴�2(鍗风粫娈�)锛屽綋鍓嶅�硷細{applyInOutDto.Floor}");
+ if (applyInOutDto.YinYang != 1 && applyInOutDto.YinYang != 2) return aGVResponse.Error($"闃撮槼鏋侀敊璇紝蹇呴』涓�1(闃存瀬)鎴�2(闃虫瀬)锛屽綋鍓嶅�硷細{applyInOutDto.YinYang}");
+ if (applyInOutDto.InOut != 1 && applyInOutDto.InOut != 2) return aGVResponse.Error($"鍑哄叆搴撶被鍨嬮敊璇紝蹇呴』涓�1(鍏ュ簱)鎴�2(鍑哄簱)锛屽綋鍓嶅�硷細{applyInOutDto.InOut}");
+ if (applyInOutDto.InOut == 1) // 鍏ュ簱
+ {
+ if (applyInOutDto.Width == null || applyInOutDto.Width <= 0) return aGVResponse.Error("鍏ュ簱鏃跺搴︿笉鑳戒负绌轰笖蹇呴』澶т簬0");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.Group)) return aGVResponse.Error("鍏ュ簱鏃舵暣鎵樼粍鍒笉鑳戒负绌�");
+ }
+ // 妫�鏌ヤ换鍔℃槸鍚﹀凡瀛樺湪
+ var existingTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == applyInOutDto.TrayNumber);
+ if (existingTask != null) return aGVResponse.Error($"WMS宸叉湁褰撳墠浠诲姟锛屼笉鍙噸澶嶄笅鍙戯紝浠诲姟鍙凤細{applyInOutDto.TaskId}");
+ // 鍒涘缓浠诲姟
+ Dt_Task task = new Dt_Task
+ {
+ OrderNo = applyInOutDto.TaskId, // 浣跨敤AGV鐨勪换鍔″彿
+ PalletCode = applyInOutDto.TrayNumber,
+ PalletType = applyInOutDto.Floor,
+ //WarehouseId = applyInOutDto.YinYang,
+ Grade = 1,
+ Creater = "AGV",
+ CreateDate = DateTime.Now,
+ Remark = $"鐗╂枡绫诲瀷锛歿applyInOutDto.MaterialType}锛岀墿鏂欐弿杩帮細{applyInOutDto.MaterialName}"
+ };
+ // 鏍规嵁闃存瀬/闃虫瀬璁剧疆宸烽亾鍜岀珯鍙�
+ if (applyInOutDto.YinYang == 1) // 闃存瀬
+ {
+ // 璐х墿鍒拌揪鍚庡垎閰嶈揣鐗╀綅
+ task.Roadway = WarehouseEnum.FJ1.ToString();
+ task.WarehouseId = (int)WarehouseEnum.FJ1;
+ task.SourceAddress = applyInOutDto.InOut == 1 ? "D10010" : "D10020"; // 鍏ュ簱鍙�/鍑哄簱鍙�
+ task.NextAddress = "D10080"; // 闃存瀬鍏叡鍑哄簱鍙�
+ task.TargetAddress = "闃存瀬鍗峰簱";
+ }
+ else if (applyInOutDto.YinYang == 2) // 闃虫瀬
+ {
+ task.Roadway = WarehouseEnum.ZJ1.ToString();
+ task.WarehouseId = (int)WarehouseEnum.ZJ1;
+ task.SourceAddress = applyInOutDto.InOut == 1 ? "D10100" : "D10090"; // 鍏ュ簱鍙�/鍑哄簱鍙�
+ task.NextAddress = "D10160"; // 闃虫瀬鍏叡鍑哄簱鍙�
+ task.TargetAddress = "姝ｆ瀬鍗峰簱";
+ }
+ // 鏍规嵁鍑哄叆搴撶被鍨嬭缃洰鏍囧湴鍧�
+ if (applyInOutDto.InOut == 1) // 鍏ュ簱
+ {
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(applyInOutDto.TrayNumber);
+ if (stockInfo != null) return aGVResponse.Error($"褰撳墠鎵樼洏{applyInOutDto.TrayNumber}宸茬粡鍏ュ簱浜�");
+
+ task.TaskType = (int)TaskInboundTypeEnum.Inbound;
+ task.TaskStatus = (int)TaskInStatusEnum.InNew;
+ task.CurrentAddress = task.SourceAddress; // 褰撳墠鍦ㄥ叆搴撳彛
+ // 淇濆瓨浠诲姟
+ var result = await BaseDal.AddDataAsync(task);
+ }
+ else // 鍑哄簱
+ {
+ // 鍒ゆ柇鏄惁绉诲簱
+ task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
+ task.TaskStatus = (int)TaskOutStatusEnum.OutNew;
+ task.CurrentAddress = task.SourceAddress; // 褰撳墠鍦ㄥ叆搴撳彛
+ // 鏌ユ壘搴撳瓨
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(applyInOutDto.TrayNumber);
+ if (stockInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹applyInOutDto.TrayNumber}鐨勫簱瀛樹俊鎭�");
+ // 楠岃瘉搴撳瓨鎵�灞炴槸鍚︽纭�
+ if (stockInfo.WarehouseId != applyInOutDto.YinYang) return aGVResponse.Error($"鎵樼洏{applyInOutDto.TrayNumber}涓嶅睘浜庡綋鍓峽(applyInOutDto.YinYang == 1 ? "闃存瀬" : "闃虫瀬")}");
+ if (stockInfo.StockStatus != (int)StockStatusEmun.鍏ュ簱瀹屾垚) return aGVResponse.Error($"鎵樼洏{applyInOutDto.TrayNumber}姝ｅ湪绉诲姩涓紝璇风◢鍚庯紒");
+ task.SourceAddress = stockInfo.LocationCode; // 婧愬湴鍧�涓鸿揣浣�
+ task.CurrentAddress = stockInfo.LocationCode; // 褰撳墠浣嶇疆鍦ㄨ揣浣�
+ task.TargetAddress = applyInOutDto.YinYang == 1 ? "D10020" : "D10090"; // 鐩爣鍦板潃涓哄嚭搴撳彛
+
+ // 淇濆瓨浠诲姟
+ var result = await BaseDal.AddDataAsync(task);
+ // 鍒ゆ柇鏄惁绉诲簱
+ //var transferTask = await _locationInfoService.TransferCheckAsync(result);
+ }
+
+ // 鏋勫缓鍝嶅簲鏁版嵁
+ AGVDataDto aGVDataDto = new AGVDataDto
+ {
+ DevId = applyInOutDto.InOut == 1 ? task.SourceAddress : task.TargetAddress,
+ TrayNumber = task.PalletCode,
+ Group = applyInOutDto.Group,
+ Width = applyInOutDto.Width ?? 0,
+ LabelNumber = applyInOutDto.LabelNumber,
+ ProductNo = applyInOutDto.ProductNo,
+ ProductName = applyInOutDto.ProductName,
+ Quantity = applyInOutDto.Quantity,
+ UomCode = applyInOutDto.UomCode,
+ ProductType = applyInOutDto.ProductType,
+ Equipment = applyInOutDto.Equipment,
+ ProductionDate = applyInOutDto.ProductionDate,
+ LowerLimitTime = applyInOutDto.LowerLimitTime,
+ WarningTime = applyInOutDto.WarningTime,
+ OverdueTime = applyInOutDto.OverdueTime
+ };
+
+ return aGVResponse.OK(aGVDataDto);
+ }
+ catch (Exception ex)
+ {
+ return aGVResponse.Error($"WMS浠诲姟鍒涘缓鎺ュ彛閿欒: {ex.Message}");
+ }
+ }
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
+ /// </summary>
+ /// <param name="outTaskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> OutTaskComplete(OutTaskCompleteDto outTaskCompleteDto)
+ {
+ WebResponseContent webResponse = new WebResponseContent();
+ try
+ {
+ if (outTaskCompleteDto == null) return webResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(outTaskCompleteDto.TaskId)) return webResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+ if (string.IsNullOrWhiteSpace(outTaskCompleteDto.DevId)) return webResponse.Error("鍑哄簱鍙ｇ紪鍙蜂笉鑳戒负绌�");
+ var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == outTaskCompleteDto.TaskId);
+ if (task == null) return webResponse.Error("鏈壘鍒颁换鍔′俊鎭�");
+ outTaskCompleteDto.ReqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ var httpResponse = _httpClientHelper.Post<AGVResponse>(AGV_OutTaskComplete, JsonSerializer.Serialize(outTaskCompleteDto)).Data;
+ // 鍒ゆ柇杩滅▼鎺ュ彛杩斿洖鏄惁鎴愬姛
+ if (httpResponse != null && httpResponse.Data != null)
+ {
+ AGVResponse agvResponse = httpResponse;
+ // 鏍规嵁code瀛楁鍒ゆ柇锛宑ode涓簍rue琛ㄧず鎴愬姛
+ if (agvResponse.Code == true)
+ {
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
+ if (stockInfo == null) return webResponse.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationCode);
+ if (locationInfo == null) return webResponse.Error($"鏈壘鍒版墭鐩榹stockInfo.LocationCode}鐨勮揣浣嶄俊鎭�");
+ if (stockInfo.StockStatus != (int)StockStatusEmun.鍑哄簱閿佸畾 || locationInfo.LocationStatus != (int)LocationStatusEnum.InStockLock)
+ {
+ return webResponse.Error($"褰撳墠搴撳瓨{stockInfo.StockStatus}鎴栬�呰揣浣峽locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+ }
+ locationInfo.LocationStatus = (int)LocationStatusEnum.Free;
+ _unitOfWorkManage.BeginTran();
+ BaseDal.DeleteData(task);
+ _locationInfoService.UpdateData(locationInfo);
+ _stockInfoService.DeleteData(stockInfo);
+ _unitOfWorkManage.CommitTran();
+ return webResponse.OK(agvResponse.Msg);
+ }
+ else
+ {
+ // 澶辫触锛氳繑鍥濧GV杩斿洖鐨勯敊璇俊鎭�
+ return webResponse.Error(string.IsNullOrWhiteSpace(agvResponse.Msg)
+ ? "AGV鎺ュ彛璋冪敤澶辫触"
+ : agvResponse.Msg);
+ }
+ }
+ else
+ {
+ // HTTP璇锋眰鏈韩澶辫触
+ return webResponse.Error(httpResponse?.Msg ?? "AGV鎺ュ彛璋冪敤寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return webResponse.Error($"WMS浠诲姟瀹屾垚鎺ュ彛閿欒锛歿ex.Message}");
+ }
+ }
+ ///// <summary>
+ ///// 浠诲姟瀹屾垚鎺ュ彛
+ ///// </summary>
+ ///// <param name="wCSTask"></param>
+ ///// <returns></returns>
+ //public async Task<WebResponseContent> TaskCompleted(WCSTaskDTO wCSTask)
+ //{
+ // WebResponseContent webResponse = new WebResponseContent();
+ // try
+ // {
+ // Dt_Task task = await BaseDal.QueryFirstAsync(x => x.TaskId == wCSTask.TaskNum && x.PalletCode == wCSTask.PalletCode);
+ // if (task == null) return webResponse.Error("鏈壘鍒颁换鍔′俊鎭�");
+ // // 鍑哄簱瀹屾垚鍙嶉
+ // OutTaskCompleteDto outTaskCompleteDto = new OutTaskCompleteDto()
+ // {
+ // TaskId = task.OrderNo,
+ // DevId = task.TargetAddress,
+ // ReqTime = DateTime.Now.ToString()
+ // };
+ // return await OutTaskComplete(outTaskCompleteDto);
+ // }
+ // catch (Exception ex)
+ // {
+ // return webResponse.Error($"WMS浠诲姟瀹屾垚鎺ュ彛閿欒锛歿ex.Message}");
+ // }
+ //}
+ /// <summary>
+ /// 杈撻�佺嚎鐢宠杩涘叆
+ /// </summary>
+ /// <param name="applyEnterDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<AGVResponse> ApplyEnterAsync(ApplyEnterDto applyEnterDto)
+ {
+ AGVResponse aGVResponse = new AGVResponse();
+ try
+ {
+ // 鍙傛暟楠岃瘉
+ if (applyEnterDto == null) return aGVResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyEnterDto.DevId)) return aGVResponse.Error("璁惧缂栧彿涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyEnterDto.TaskId)) return aGVResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+ if (applyEnterDto.InOut != 1 && applyEnterDto.InOut != 2) return aGVResponse.Error($"鍑哄叆搴撶被鍨嬮敊璇紝蹇呴』涓�1(鍏ュ簱)鎴�2(鍑哄簱)锛屽綋鍓嶅�硷細{applyEnterDto.InOut}");
+
+ // 鏌ヨ浠诲姟鏄惁瀛樺湪
+ var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == applyEnterDto.TaskId);
+ if (task == null) return aGVResponse.Error($"鏈壘鍒颁换鍔′俊鎭紝浠诲姟鍙凤細{applyEnterDto.TaskId}");
+ if (applyEnterDto.InOut == 1 && task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskStatus == (int)TaskInStatusEnum.InNew)
+ {
+ aGVResponse.OK();
+ }
+ else if(applyEnterDto.InOut == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.TaskStatus == (int)TaskStatusEnum.Line_Finish)
+ {
+ aGVResponse.OK();
+ }
+ return aGVResponse.Error($"杈撻�佺嚎{applyEnterDto.DevId}褰撳墠绻佸繖锛岃绋嶅悗閲嶈瘯");
+
+ // Dt_Task.SourceAddress璇㈤棶wcs绔欏彴1-闃存瀬鍏ュ彛鍙獶10010鍜孌10020锛�2-闃虫瀬D10090鍜孌10100鏄惁鏈夎揣鐗�
+ //var httpResponse = _httpClientHelper.Post<WebResponseContent>("http://127.0.0.1:9999/api/Task/ApplyInOut", JsonSerializer.Serialize(task)).Data;
+ //if (httpResponse != null && httpResponse.Status == true)
+ //{
+ // _unitOfWorkManage.BeginTran();
+ // task.TaskStatus = (int)TaskStatusEnum.AGV_Executing;
+ // await BaseDal.UpdateDataAsync(task);
+ // _unitOfWorkManage.CommitTran();
+ // return aGVResponse.OK();
+ //}
+ //else
+ //{
+ // return aGVResponse.Error($"绔欏彴{task.SourceAddress}宸茬粡杞借揣");
+ //}
+ }
+ catch (Exception ex)
+ {
+ //_unitOfWorkManage.RollbackTran();
+ return aGVResponse.Error($"WMS杈撻�佺嚎鐢宠鎺ュ彛閿欒锛歿ex.Message}");
+ }
+ }
+ /// <summary>
+ /// 鍙栨斁璐у畬鎴�
+ /// </summary>
+ /// <param name="taskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<AGVResponse> TaskCompleteAsync(TaskCompleteDto taskCompleteDto)
+ {
+ AGVResponse aGVResponse = new AGVResponse();
+ try
+ {
+ if (taskCompleteDto == null) return aGVResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(taskCompleteDto.TaskId)) return aGVResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+ if (string.IsNullOrWhiteSpace(taskCompleteDto.DevId)) return aGVResponse.Error("璁惧缂栧彿涓嶈兘涓虹┖");
+ if (taskCompleteDto.InOut != 1 && taskCompleteDto.InOut != 2) return aGVResponse.Error($"鍑哄叆搴撶被鍨嬮敊璇紝蹇呴』涓�1(鍏ュ簱)鎴�2(鍑哄簱)锛屽綋鍓嶅�硷細{taskCompleteDto.InOut}");
+ var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == taskCompleteDto.TaskId);
+ if (task == null) return aGVResponse.Error($"鏈壘鍒颁换鍔′俊鎭紝浠诲姟鍙凤細{taskCompleteDto.TaskId}");
+ if (taskCompleteDto.InOut == 2)
+ {
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
+ if (stockInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationCode);
+ if (locationInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹stockInfo.LocationCode}鐨勮揣浣嶄俊鎭�");
+ if (stockInfo.StockStatus != (int)StockStatusEmun.鍑哄簱閿佸畾 || locationInfo.LocationStatus != (int)LocationStatusEnum.InStockLock)
+ {
+ return aGVResponse.Error($"褰撳墠搴撳瓨{stockInfo.StockStatus}鎴栬�呰揣浣峽locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+ }
+ locationInfo.LocationStatus = (int)LocationStatusEnum.Free;
+ task.TaskStatus = (int)TaskOutStatusEnum.OutFinish;
+ _unitOfWorkManage.BeginTran();
+ _stockInfoService.DeleteData(stockInfo);
+ await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ //鏌ユ壘鍙敤璐т綅
+ var availableLocation = await _locationInfoService.GetLocationInfo(task.Roadway);
+
+ if (availableLocation == null) return aGVResponse.Error("鏃犲彲鐢ㄧ殑鍏ュ簱璐т綅");
+
+ task.TargetAddress = availableLocation.LocationCode;
+ // 閫氱煡WCS鍏ュ簱
+ var wcsTaskDto = _mapper.Map<WCSTaskDTO>(task);
+ var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, JsonSerializer.Serialize(wcsTaskDto));
+ if (httpResponse == null) return aGVResponse.Error("涓嬪彂WCS澶辫触");
+
+ task.TaskStatus = (int)TaskStatusEnum.Line_Executing;
+ task.Dispatchertime = DateTime.Now;
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(task.TargetAddress);
+ if (locationInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹task.TargetAddress}鐨勮揣浣嶄俊鎭�");
+ if (locationInfo.LocationStatus != (int)LocationStatusEnum.InStock)
+ {
+ return aGVResponse.Error($"褰撳墠璐т綅{locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+ }
+ Dt_StockInfo dt_Stock = new Dt_StockInfo()
+ {
+ PalletCode = task.PalletCode,
+ StockStatus = (int)StockStatusEmun.鍏ュ簱纭,
+ LocationCode = locationInfo.LocationCode,
+ WarehouseId = task.WarehouseId,
+ Creater = "AGV",
+ CreateDate = DateTime.Now
+ };
+ locationInfo.LocationStatus = (int)LocationStatusEnum.FreeLock;
+ _unitOfWorkManage.BeginTran();
+ BaseDal.UpdateData(task);
+ _locationInfoService.UpdateData(locationInfo);
+ _stockInfoService.AddData(dt_Stock);
+ _unitOfWorkManage.CommitTran();
+ }
+ return aGVResponse.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return aGVResponse.Error($"WMS鍙栨斁璐у畬鎴愭帴鍙ｉ敊璇細{ex.Message}");
+ }
+ }
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskCancelDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<AGVResponse> TaskCancelAsync(TaskCancelDto taskCancelDto)
+ {
+ AGVResponse aGVResponse = new AGVResponse();
+ try
+ {
+ if (taskCancelDto == null) return aGVResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(taskCancelDto.TaskId)) return aGVResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+
+ var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == taskCancelDto.TaskId);
+ // 娌℃湁浠诲姟寮哄埗鍙栨秷
+ if (task == null) return aGVResponse.OK();
+
+ if (task.TaskStatus == (int)TaskInStatusEnum.InNew)
+ {
+ task.TaskStatus = (int)TaskInStatusEnum.InCancel;
+ // 鍏ュ簱浠诲姟鐩存帴鍒犻櫎
+ _unitOfWorkManage.BeginTran();
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ return aGVResponse.OK();
+ }
+ else if(task.TaskStatus == (int)TaskOutStatusEnum.OutNew)
+ {
+ // 鍑哄簱浠诲姟鎭㈠搴撳瓨
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
+ if (stockInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationCode);
+ if (locationInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹stockInfo.LocationCode}鐨勮揣浣嶄俊鎭�");
+ if (stockInfo.StockStatus != (int)StockStatusEmun.鍑哄簱閿佸畾 || locationInfo.LocationStatus != (int)LocationStatusEnum.InStockLock)
+ {
+ return aGVResponse.Error($"褰撳墠搴撳瓨{stockInfo.StockStatus}鎴栬�呰揣浣峽locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+ }
+ stockInfo.StockStatus = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ locationInfo.LocationStatus = (int)LocationStatusEnum.InStock;
+ task.TaskStatus = (int)TaskOutStatusEnum.OutCancel;
+ _unitOfWorkManage.BeginTran();
+ _locationInfoService.UpdateData(locationInfo);
+ _stockInfoService.UpdateData(stockInfo);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ return aGVResponse.OK();
+ }
+ return aGVResponse.Error("浠诲姟宸茬粡鍦ㄦ墽琛屼腑锛屼笉鍙彇娑�");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return aGVResponse.Error($"WMS浠诲姟鍙栨秷鎺ュ彛閿欒锛歿ex.Message}");
+ }
+ }
+
+ #endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
}
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
index 30de01d..17d2a3f 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
@@ -1,6 +1,7 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using System.DirectoryServices.Protocols;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
@@ -198,5 +199,71 @@
{
return await Service.GetPalletCodeCellAsync(input);
}
+
+ #region 鏋佸嵎搴撲换鍔℃ā鍧�
+
+ /// <summary>
+ /// 鍑哄叆搴撶敵璇�
+ /// </summary>
+ /// <param name="applyInOutDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost("ApplyInOut"), AllowAnonymous]
+ public async Task<AGVResponse> ApplyInOutAsync([FromBody] ApplyInOutDto applyInOutDto)
+ {
+ return await Service.ApplyInOutAsync(applyInOutDto);
+ }
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
+ /// </summary>
+ /// <param name="outTaskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost, Route("OutTaskComplete"), AllowAnonymous]
+ public async Task<WebResponseContent> OutTaskComplete([FromBody] OutTaskCompleteDto outTaskCompleteDto)
+ {
+ return await Service.OutTaskComplete(outTaskCompleteDto);
+ }
+ ///// <summary>
+ ///// 浠诲姟瀹屾垚
+ ///// </summary>
+ ///// <param name="wCSTask">璇锋眰鍙傛暟</param>
+ ///// <returns></returns>
+ //[HttpPost, Route("TaskCompleted"), AllowAnonymous]
+ //public async Task<WebResponseContent?> TaskCompleted([FromBody] WCSTaskDTO wCSTask)
+ //{
+ // return await Service.TaskCompleted(wCSTask);
+ //}
+ /// <summary>
+ /// 杈撻�佺嚎鐢宠杩涘叆
+ /// </summary>
+ /// <param name="applyEnterDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost("ApplyEnter"), AllowAnonymous]
+ public async Task<AGVResponse?> ApplyEnterAsync([FromBody] ApplyEnterDto applyEnterDto)
+ {
+ return await Service.ApplyEnterAsync(applyEnterDto);
+ }
+
+ /// <summary>
+ /// 鍙栨斁璐у畬鎴�
+ /// </summary>
+ /// <param name="taskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost("TaskComplete"), AllowAnonymous]
+ public async Task<AGVResponse?> TaskCompleteAsync([FromBody] TaskCompleteDto taskCompleteDto)
+ {
+ return await Service.TaskCompleteAsync(taskCompleteDto);
+ }
+
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskCancelDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost("TaskCancel"), AllowAnonymous]
+ public async Task<AGVResponse?> TaskCancelAsync([FromBody] TaskCancelDto taskCancelDto)
+ {
+ return await Service.TaskCancelAsync(taskCancelDto);
+ }
+ #endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
}
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
index 42a6bb4..f360a67 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
@@ -35,6 +35,7 @@
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_ShanMei;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_ShanMei;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=WMS_TC;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//鏃MS鏁版嵁搴撹繛鎺�
//"TeConnectionString": "Data Source=10.30.4.92;Initial Catalog=TeChuang;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
@@ -72,5 +73,7 @@
"MES": {
"BaseUrl": "http://localhost:5000",
"Authorization": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMwMTcyNzM5Mzk5NzYxOTIwIiwibmFtZSI6IlBBQ0voo4XphY3lt6XkvY0wMSIsIkZhY3RvcnlJZCI6IjEyMzQ1NiIsIlNpdGVJZCI6IjEyMzQ1NiIsIkNvZGUiOiJYWExQQUNLMDRBRTAzMiIsIm5iZiI6MTcwNDE4NzY5MCwiZXhwIjoyMTQ1NjkxNjkwLCJpc3MiOiJodHRwczovL3d3dy5oeW1zb24uY29tIiwiYXVkIjoiaHR0cHM6Ly93d3cuaHltc29uLmNvbSJ9.An1BE7UgfcSP--LtTOmmmWVE2RQFPDahLkDg1xy5KqY"
- }
+ },
+ "AGV_OutTaskComplete": "http://localhost:9999/OutTaskComplete", // 涓婃姤AGV鍑哄簱杈撻�佺嚎瀹屾垚
+ "WCS_ReceiveTask": "http://localhost:9292/api/Task/ReceiveTask" // WMS杈撻�佺嚎浠诲姟涓嬪彂
}
\ No newline at end of file
--
Gitblit v1.9.3