From 90a0c4e0ab42a3574cfb6f9fd3b031dac9e7fb0d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 13 三月 2025 18:04:58 +0800
Subject: [PATCH] 空托出入库
---
项目代码/芜湖三一PDA/pages/stash/index.vue | 2
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1b491b5d-708a-47fa-8233-947a9dfe5dae.vsidx | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfoInputs.cache | 2
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2fbcc71c-e89f-4eaf-9e3e-5620623c5b7c.vsidx | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderService.cs | 21 ++---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs | 13 +++
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3d7373a2-c833-48a2-84db-b4f90a14151a.vsidx | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6c0962e3-1750-4e24-a425-5ec6cb7fd82e.vsidx | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f2619808-2276-4f7b-b10f-25bba5f2f2a7.vsidx | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 12 ++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 24 ++++--
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs | 14 +++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs | 9 ++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs | 5 +
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 53 ++++++++----
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 2
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskEnumHelper.cs | 2
项目代码/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue | 16 ++--
项目代码/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 7 +
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 7 +
/dev/null | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f555f070-9bec-4ac8-8eba-d2791e9e4182.vsidx | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs | 1
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 3
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 6 +
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfo.cs | 2
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0
项目代码/芜湖三一PDA/pages/stash/InEmpty.vue | 2
31 files changed, 143 insertions(+), 64 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1547cbf2-c9fa-4c66-bc78-775795d35492.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2fbcc71c-e89f-4eaf-9e3e-5620623c5b7c.vsidx"
similarity index 70%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1547cbf2-c9fa-4c66-bc78-775795d35492.vsidx"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2fbcc71c-e89f-4eaf-9e3e-5620623c5b7c.vsidx"
index 0afe13b..deb3437 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1547cbf2-c9fa-4c66-bc78-775795d35492.vsidx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2fbcc71c-e89f-4eaf-9e3e-5620623c5b7c.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/935e8d57-93ab-45b7-b509-2e1142bbe1c6.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/935e8d57-93ab-45b7-b509-2e1142bbe1c6.vsidx"
deleted file mode 100644
index 68faa31..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/935e8d57-93ab-45b7-b509-2e1142bbe1c6.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f2619808-2276-4f7b-b10f-25bba5f2f2a7.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f2619808-2276-4f7b-b10f-25bba5f2f2a7.vsidx"
new file mode 100644
index 0000000..0d45523
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f2619808-2276-4f7b-b10f-25bba5f2f2a7.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a30eb098-387a-4e7b-9653-a6730663a279.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f555f070-9bec-4ac8-8eba-d2791e9e4182.vsidx"
similarity index 92%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a30eb098-387a-4e7b-9653-a6730663a279.vsidx"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f555f070-9bec-4ac8-8eba-d2791e9e4182.vsidx"
index b8eb72d..b73f059 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a30eb098-387a-4e7b-9653-a6730663a279.vsidx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f555f070-9bec-4ac8-8eba-d2791e9e4182.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
index 26ed927..bc18a51 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
@@ -22,7 +22,7 @@
{
return TaskTypeGroup.OutbondGroup;
}
- else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskType.ToString()).ToString(), out result))
+ else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(taskType.ToString()).ToString(), out result))
{
return TaskTypeGroup.InboundGroup;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
index 06f11fc..acfd4a7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
@@ -28,7 +28,12 @@
/// 璐ㄦ鍏ュ簱
/// </summary>
[Description("璐ㄦ鍏ュ簱")]
- InQuality = 203
+ InQuality = 203,
+ /// <summary>
+ /// 鍏ョ┖鎵�
+ /// </summary>
+ [Description("鍏ョ┖鎵�")]
+ PalletInbound = 204,
}
public enum TaskOutboundTypeEnum
@@ -53,6 +58,12 @@
/// </summary>
[Description("璐ㄦ鍑哄簱")]
OutQuality = 103,
+ /// <summary>
+ /// 鍑虹┖鎵�
+ /// </summary>
+ [Description("鍑虹┖鎵�")]
+ PalletOutbound = 104,
+
}
/// <summary>
/// 绉诲簱
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs"
index 3deb548..3dc40fc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs"
@@ -60,6 +60,7 @@
task.TargetIsPickPlace = receiveWMSInfo.TargetIsPickPlace;
task.TargetAddress = receiveWMSInfo.TargetAddress;
task.NextAddress = task.TargetAddress;
+ task.ExceptionMessage = null;
}
else
task.ExceptionMessage = content.Message;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 831607e..912343e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -107,7 +107,8 @@
//鏆備笉鑰冭檻澶氳矾寰�
if (routers.Count > 0)
{
- task.TaskState = (int)TaskInStatusEnum.InNew;
+ if (task.TaskType != TaskInboundTypeEnum.PalletInbound.ObjToInt())
+ task.TaskState = (int)TaskInStatusEnum.InNew;
task.CurrentAddress = item.SourceAddress;
task.NextAddress = routers.FirstOrDefault().ChildPosi;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 718ef91..529e954 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -145,7 +145,7 @@
//}
#endregion
}
- else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ else if (/*task.TaskType == (int)TaskInboundTypeEnum.Inbound*/_taskService.TaskInboundTypes.Contains(task.TaskType))
{
var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//鍏ュ簱浠诲姟鍒ゆ柇缁堢偣鏄惁鏈夌┛姊溅
if (task.TargetIsPickPlace && ShuttleCar != null)//绉昏蛋
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
index 845074b..f777c39 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
@@ -192,14 +192,14 @@
width: 180,
align: "left",
},
- {
- field: "status",
- title: "搴撳瓨鏄庣粏鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
+ // {
+ // field: "status",
+ // title: "搴撳瓨鏄庣粏鐘舵��",
+ // type: "string",
+ // width: 120,
+ // align: "left",
+ // bind: { key: "stockStatusEmun", data: [] },
+ // },
{
field: "creater",
title: "鍒涘缓浜�",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
index 5356fc4..d87ae29 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
@@ -179,6 +179,13 @@
align: "left",
},
{
+ field: "operateType",
+ title: "鎿嶄綔绫诲瀷",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
field: "wMSId",
title: "WMS浠诲姟涓婚敭",
type: "int",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/04dfd08a-0df7-4984-8823-17863c140b0e.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/04dfd08a-0df7-4984-8823-17863c140b0e.vsidx"
deleted file mode 100644
index fa71002..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/04dfd08a-0df7-4984-8823-17863c140b0e.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1b491b5d-708a-47fa-8233-947a9dfe5dae.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1b491b5d-708a-47fa-8233-947a9dfe5dae.vsidx"
new file mode 100644
index 0000000..758592d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1b491b5d-708a-47fa-8233-947a9dfe5dae.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3d7373a2-c833-48a2-84db-b4f90a14151a.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3d7373a2-c833-48a2-84db-b4f90a14151a.vsidx"
new file mode 100644
index 0000000..f92dbee
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3d7373a2-c833-48a2-84db-b4f90a14151a.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bed52a86-9d9e-40fe-bf67-b751f88f0c1c.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6c0962e3-1750-4e24-a425-5ec6cb7fd82e.vsidx"
similarity index 71%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bed52a86-9d9e-40fe-bf67-b751f88f0c1c.vsidx"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6c0962e3-1750-4e24-a425-5ec6cb7fd82e.vsidx"
index 7ce068e..8496d3b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bed52a86-9d9e-40fe-bf67-b751f88f0c1c.vsidx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6c0962e3-1750-4e24-a425-5ec6cb7fd82e.vsidx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b930ac60-10e4-42f6-9dce-9d0b7f40fa57.vsidx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b930ac60-10e4-42f6-9dce-9d0b7f40fa57.vsidx"
deleted file mode 100644
index 01362e6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b930ac60-10e4-42f6-9dce-9d0b7f40fa57.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
index 0b2b7d6..3909c5a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
index 07e6425..3ef43b0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
index a8cd1fa..648514e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
@@ -77,20 +77,24 @@
/// <returns></returns>
public Dt_LocationInfo AssignLocation()
{
- Dt_LocationInfo locationInfo = null;
- locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.Row == 3, _emptyAssignOrderBy);
+ Dt_LocationInfo? locationInfo = null;
+ string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//鑾峰彇绌挎杞﹀厖鐢典綅缃�
+ var ChargingStations = CarChargingStation.Split(",");
+ locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.Row == 3, _emptyAssignOrderBy);
if (locationInfo == null)
- locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 1), _emptyAssignOrderBy);
+ locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 1), _emptyAssignOrderBy);
if (locationInfo == null)
- locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 2), _emptyAssignOrderBy);
+ locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 2), _emptyAssignOrderBy);
return locationInfo;
}
public Dt_LocationInfo AssignLocation(string[] Stations)
{
Dt_LocationInfo? locationInfo = null;
- locationInfo = BaseDal.QueryData(x => Stations.Contains(x.LocationCode) && x.CurrentQty < x.MaxQty - 1, _emptyAssignOrderBy).First();
+ var locationInfos = BaseDal.QueryData(x => Stations.Contains(x.LocationCode) && x.CurrentQty < x.MaxQty - 1, _emptyAssignOrderBy);
+ if (locationInfos != null && locationInfos.Count > 0)
+ locationInfo = locationInfos[0];
return locationInfo;
}
/// <summary>
@@ -102,12 +106,16 @@
/// <exception cref="Exception"></exception>
public Dt_LocationInfo AssignLocation(int inboundOrderCount)
{
- Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.CurrentQty < 1 && x.Row == (inboundOrderCount > 1 ? 1 : 3), _emptyAssignOrderBy);
+ string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//鑾峰彇绌挎杞﹀厖鐢典綅缃�
+ var ChargingStations = CarChargingStation.Split(",");
+ Dt_LocationInfo? locationInfo = null;
+ var locationInfos = BaseDal.QueryData(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.CurrentQty < 1 && x.Row == (inboundOrderCount > 1 ? 1 : 3), _emptyAssignOrderBy);
+ if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];
if (locationInfo == null)
{
- var locationInfos = BaseDal.QueryData(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.CurrentQty < 1), _emptyAssignOrderBy);
- if (locationInfos.Count > 1) locationInfo = locationInfos[0];//闇�棰勭暀涓�涓揣浣嶇Щ搴�
+ locationInfos = BaseDal.QueryData(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.CurrentQty < 1), _emptyAssignOrderBy);
+ if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];//闇�棰勭暀涓�涓揣浣嶇Щ搴�
}
return locationInfo;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskEnumHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskEnumHelper.cs"
index 8f848cf..f8cf313 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskEnumHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskEnumHelper.cs"
@@ -21,7 +21,7 @@
{
return TaskTypeGroup.OutbondGroup;
}
- else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskType.ToString()).ToString(), out result))
+ else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(taskType.ToString()).ToString(), out result))
{
return TaskTypeGroup.InboundGroup;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
index d924cbb..601d312 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
@@ -28,7 +28,13 @@
/// 璐ㄦ鍏ュ簱
/// </summary>
[Description("璐ㄦ鍏ュ簱")]
- InQuality = 203
+ InQuality = 203,
+
+ /// <summary>
+ /// 鍏ョ┖鎵�
+ /// </summary>
+ [Description("鍏ョ┖鎵�")]
+ PalletInbound = 204,
}
public enum TaskOutboundTypeEnum
@@ -53,6 +59,12 @@
/// </summary>
[Description("璐ㄦ鍑哄簱")]
OutQuality = 103,
+
+ /// <summary>
+ /// 鍑虹┖鎵�
+ /// </summary>
+ [Description("鍑虹┖鎵�")]
+ PalletOutbound = 104,
}
public enum TaskRelocationTypeEnum
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
index 9b98f2e..5f3be2c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
@@ -49,7 +49,7 @@
[ImporterHeader(Name = "鍒涘缓鏃堕棿")]
[ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")]
[SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鍒涘缓鏃堕棿")]
- public DateTime CreateDate { get; set; }= DateTime.Now;
+ public DateTime CreateDate { get; set; }
#endregion
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfo.cs"
index 3bac0a0..4071c9a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfo.cs"
@@ -15,7 +15,7 @@
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyDescriptionAttribute("dddddddddddddddddddddddddddddddddddd")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.1.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.1+58ebc83f3892b4d84d2cb07a388ac361268a4a19")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.1")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_Core")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_Core")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.1.0")]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfoInputs.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfoInputs.cache"
index 3fc57ea..3e4007e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfoInputs.cache"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-5be948cc7d84038f5664f907cc9b5068af9b31c625e366a3c7e4d48129ec9d99
+264e59f6345328726b244104627f6ef423db410c687b2b588086157df0b522f6
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
index 979ab9b..af86350 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
@@ -74,16 +74,19 @@
Dispatchertime = DateTime.Now,
};
Db.Ado.BeginTran();
- _stockService.StockInfoService.AddStockEmpty(barcode);
+ WebResponseContent content = _stockService.StockInfoService.AddStockEmpty(barcode);
+ if (!content.Status) throw new Exception(content.Message);
_taskRepository.AddData(task);
List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(new List<Dt_Task> { task });
var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ReceiveTask, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
if (ResultData.Result == null) throw new Exception($"鍚慦CS涓嬪彂绌烘墭鍏ュ簱浠诲姟瓒呮椂");
- WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
+ content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
if (content == null) throw new Exception($"涓嬪彂绌烘墭鍏ュ簱浠诲姟WCS鏃犲搷搴�");
if (!content.Status) throw new Exception(content.Message);
Db.Ado.CommitTran();
}
+ else
+ throw new Exception($"鎵樼洏鍙枫�恵barcode}銆戝凡瀛樺湪浠诲姟");
#endregion
return WebResponseContent.Instance.OK();
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
index 2a3aac4..d5b1537 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
@@ -15,6 +15,7 @@
using WIDESEA_Core.Utilities;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
+using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
@@ -31,16 +32,18 @@
private readonly IStockInfoService _stockService;
private readonly IStockInfoDetailService _stockDetailService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IBasicRepository _basicRepository;
private readonly ITaskRepository _taskRepository;
private readonly SqlSugarClient _dbBase;
public IOutboundOrderRepository Repository => BaseDal;
- public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IMaterielInfoService materielInfoService, IStockInfoDetailService stockDetailService, IStockInfoService stockInfoService, IUnitOfWorkManage unitOfWorkManage,ITaskRepository taskRepository) : base(BaseDal)
+ public OutboundOrderService(IOutboundOrderRepository BaseDal, IBasicRepository basicRepository, IMapper mapper, IMaterielInfoService materielInfoService, IStockInfoDetailService stockDetailService, IStockInfoService stockInfoService, IUnitOfWorkManage unitOfWorkManage,ITaskRepository taskRepository) : base(BaseDal)
{
_mapper = mapper;
_materielInfoService = materielInfoService;
_stockDetailService = stockDetailService;
+ _basicRepository = basicRepository;
_stockService = stockInfoService;
_dbBase = unitOfWorkManage.GetDbClient();
_taskRepository = taskRepository;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderService.cs"
index 60c1dd3..736d0c0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderService.cs"
@@ -39,7 +39,7 @@
{
ISugarQueryable<Dt_StockInfo> sugarQueryable1 = _dbBase.Queryable<Dt_StockInfo>();
ISugarQueryable<Dt_StockInfoDetail> sugarQueryable2 = _dbBase.Queryable<Dt_StockInfoDetail>();
- List<StockViewDTO1> list = sugarQueryable1.InnerJoin(sugarQueryable2, (a, b) => a.Id == b.StockId && b.MaterielName.Contains("绌烘墭") && a.StockStatus == StockStatusEmun.宸插叆搴�.ObjToInt()).Select((a, b) => new StockViewDTO1
+ List<StockViewDTO1> list = sugarQueryable1.InnerJoin(sugarQueryable2, (a, b) => a.Id == b.StockId && b.MaterielName.Contains("绌烘墭鐩�") && a.StockStatus == StockStatusEmun.宸插叆搴�.ObjToInt()).Select((a, b) => new StockViewDTO1
{
LocationCode = a.LocationCode,
PalletCode = a.PalletCode,
@@ -52,20 +52,17 @@
if (stockViewDTO == null) throw new Exception("鏈壘鍒板彲鍑哄簱绌烘墭");
Dt_LocationInfo locationInfo = _dbBase.Queryable<Dt_LocationInfo>().Where(x => x.LocationCode == stockViewDTO.LocationCode).First();
if (locationInfo == null) throw new Exception($"鏈壘鍒拌揣浣嶃�恵stockViewDTO.LocationCode}銆戜俊鎭�");
- Dt_StockInfo stockInfo = sugarQueryable1.Where(x => x.Id == stockViewDTO.StockId).Includes(x => x.Details).First();
+ Dt_StockInfo stockInfo = _stockService.Repository.QueryFirst(a => a.Id == stockViewDTO.StockId);
if (stockInfo == null) throw new Exception($"鏈壘鍒扮┖鎵樺簱瀛樹俊鎭�");
stockInfo.StockStatus = StockStatusEmun.鍑哄簱涓�.ObjToInt();
- stockInfo.Details.ForEach(x =>
- {
- x.Status = StockStatusEmun.鍑哄簱涓�.ObjToInt();
- });
- locationInfo.CurrentQty--;
Dt_Task _Task = new Dt_Task()
{
CurrentAddress = locationInfo.LocationCode,
NextAddress = "SC01",
SourceAddress = locationInfo.LocationCode,
- TargetAddress = "SC01",
+ SourceIsPickPlace = locationInfo.Row == 1 ? false : locationInfo.CurrentQty == locationInfo.MaxQty,
+ TargetIsPickPlace = false,
+ TargetAddress = "1008",
CreateDate = DateTime.Now,
Creater = "System",
PalletCode = stockViewDTO.PalletCode,
@@ -76,11 +73,11 @@
TaskType = TaskTypeEnum.PalletOutbound.ObjToInt(),
Dispatchertime = DateTime.Now,
};
- List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(_Task);
+ locationInfo.CurrentQty--;
+ List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(new List<Dt_Task>() { _Task });
Db.Ado.BeginTran();
- _dbBase.Updateable(locationInfo);
- _stockService.UpdateData(stockInfo);
- _stockDetailService.UpdateData(stockInfo.Details);
+ _basicRepository.LocationInfoRepository.UpdateData(locationInfo);
+ _stockService.Repository.UpdateData(stockInfo);
_taskRepository.AddData(_Task);
var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ReceiveTask, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
if (ResultData.Result == null) throw new Exception($"鍚慦CS涓嬪彂绌烘墭鍑哄簱浠诲姟瓒呮椂");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
index 518cc49..38a0c82 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
@@ -99,7 +99,14 @@
//}
var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
if (task == null) throw new Exception($"鏈壘鍒版墭鐩樺彿[{lineDTO.Barcode}]鐨勫叆搴撲换鍔�");
- if (task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt()) return content;
+ if (task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt())
+ {
+ task.NextAddress = "1004";
+ task.CurrentAddress = lineDTO.stationCode;
+ task.TaskState = (int)InTaskStatusEnum.Line_InExecuting;
+ BaseDal.UpdateData(task);
+ return content;
+ }
if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt()) throw new Exception($"鏈壘鍒版墭鐩樺彿[{lineDTO.Barcode}]鐨勫叆搴撲换鍔�");
//if (task.TaskState != (int)InTaskStatusEnum.AGV_InFinish) throw new Exception($"鎵樼洏鍙穂{lineDTO.Barcode}]鐨勫叆搴撲换鍔＄姸鎬佷笉鍖归厤");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
index 90c8d2c..3e82900 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
@@ -303,7 +303,10 @@
Dt_LocationInfo? locationInfo = null;
string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//鑾峰彇绌挎杞﹀厖鐢典綅缃�
var ChargingStations = CarChargingStation.Split(",");
- Dt_StockInfoDetail instockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryData(x => x.MaterielCode == stockInfoDetail.MaterielCode).OrderByDescending(x => x.CreateDate).First();
+ Dt_StockInfoDetail? instockInfoDetail = null;
+ var instockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => x.MaterielCode == stockInfoDetail.MaterielCode && x.Status == StockStatusEmun.宸插叆搴�.ObjToInt());
+ if (instockInfoDetails != null && instockInfoDetails.Count > 0)
+ instockInfoDetail = instockInfoDetails.OrderByDescending(x => x.CreateDate).First();
if (instockInfoDetail != null) instockInfo = _stockService.StockInfoService.Repository.GetStockInfo(instockInfoDetail.StockId);
if (instockInfo != null)//鏃犲簱瀛�
{
@@ -323,6 +326,12 @@
}
if (locationInfo == null) locationInfo = _basicService.LocationInfoService.AssignLocation(2);//閲嶆柊鍒嗛厤璐т綅
if (locationInfo == null) throw new Exception($"鏃犲彲鍏ヨ揣浣�");
+ Dt_LocationInfo? locationInfo1 = null;
+ if (locationInfo.Row == 1)
+ {
+ locationInfo1 = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == 2 && x.Layer == locationInfo.Layer && x.Column == locationInfo.Column);
+ locationInfo1.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ }
task.TaskState = (int)InTaskStatusEnum.SC_InExecuting;
task.CurrentAddress = task.NextAddress;
@@ -343,6 +352,7 @@
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ if (locationInfo1 != null) _basicService.LocationInfoService.Repository.UpdateData(locationInfo1);
Db.Ado.CommitTran();
return WebResponseContent.Instance.OK(data: new ReceiveWMSInfo()
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
index 84caa30..0a2d4fa 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
@@ -132,6 +132,8 @@
CurrentAddress = stockInfo.LocationCode,
Grade = 0,
PalletCode = stockInfo.PalletCode,
+ TargetIsPickPlace = false,
+ SourceIsPickPlace = locationInfo.Row == 1 ? false : stockInfo.SerialNumber == locationInfo.MaxQty,
NextAddress = "1008",
Roadway = locationInfo.RoadwayNo,
SourceAddress = stockInfo.LocationCode,
@@ -161,7 +163,7 @@
{
var locationInfo1 = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == 2 && x.Column == locationInfo.Column && x.Layer == locationInfo.Layer);
stockInfos = _stockService.StockInfoService.Repository.QueryData(x => locationInfo1.LocationCode == x.LocationCode).OrderByDescending(x => x.SerialNumber).ToList();
- if (stockInfos == null|| stockInfos.Count < 1)
+ if (stockInfos == null || stockInfos.Count < 1)
{
return (dt_Tasks, locationInfos, stockInfos);
}
@@ -178,7 +180,7 @@
{
CurrentAddress = item.LocationCode,
SourceIsPickPlace = item.SerialNumber == 12,
- TargetIsPickPlace = i == 12,
+ TargetIsPickPlace = i == 12 ? locationInfo2.Row != 1 : false,
Grade = 0,
PalletCode = item.PalletCode,
NextAddress = locationInfo2.LocationCode,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index bcf6a63..369e09c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -262,7 +262,7 @@
{
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == WMStask.TaskNum && x.TaskType == WMStask.TaskType);
if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
- if (task.TaskType == (int)TaskTypeEnum.Inbound)
+ if (TaskEnumHelper.GetTaskTypeGroup(task.TaskType) == TaskTypeGroup.InboundGroup)
{
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
if (WMStask.TaskState != nextStatus) return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佹湁璇�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
@@ -283,7 +283,7 @@
break;
//case (int)TaskOutStatusEnum.Line_OutFinish:
- //break;
+ //break;
case (int)TaskOutStatusEnum.OutFinish:
UpdateTaskStatusOutFinish(task);
break;
@@ -327,7 +327,7 @@
}
if (Sourcelocation != null)
{
- Sourcelocation.CurrentQty--;
+ if (task.TaskType == TaskOutboundTypeEnum.Outbound.ObjToInt()) Sourcelocation.CurrentQty--;
if (Sourcelocation.CurrentQty == 0)
{
Sourcelocation.LocationStatus = LocationStatusEnum.Free.ObjToInt();
@@ -336,8 +336,9 @@
if (Sourcelocation.Row == 1 && Sourcelocation.LocationStatus == LocationStatusEnum.Free.ObjToInt())
{
Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == 2 && x.Column == Sourcelocation.Column && x.Layer == Sourcelocation.Layer);
- if (locationInfo.CurrentQty == 0 && locationInfo.LocationStatus == LocationStatusEnum.Free.ObjToInt())
+ if (locationInfo.CurrentQty == 0 /*&& locationInfo.LocationStatus == LocationStatusEnum.Free.ObjToInt()*/)
{
+ locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
locationInfo.EnableStatus = EnableStatusEnum.Normal.ObjToInt();
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
}
@@ -368,11 +369,11 @@
{
try
{
- Dt_OutStockLockInfo outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.TaskNum == task.TaskNum);
+ Dt_OutStockLockInfo? outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.TaskNum == task.TaskNum);
+ Dt_OutboundOrder? outboundOrder = null;
+ int overCount = 0;
if (outStockLockInfo != null)
{
- Dt_OutboundOrder outboundOrder = null;
- int overCount = 0;
Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfo.OrderDetailId);
if (outboundOrderDetail != null)
{
@@ -387,17 +388,17 @@
}
}
outStockLockInfo.Status = OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
- Db.Ado.BeginTran();
- if (outboundOrder != null && outboundOrder.Details.Count == overCount)
- {
- outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
- _outboundService.OutboundOrderService.Repository.DeleteAndMoveIntoHty(outboundOrder, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- _outboundService.OutboundOrderDetailService.Repository.DeleteAndMoveIntoHty(outboundOrder.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- }
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- _outboundService.OutboundStockLockInfoService.Repository.UpdateData(outStockLockInfo);
- Db.Ado.CommitTran();
}
+ Db.Ado.BeginTran();
+ if (outboundOrder != null && outboundOrder.Details.Count == overCount)
+ {
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ _outboundService.OutboundOrderService.Repository.DeleteAndMoveIntoHty(outboundOrder, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ _outboundService.OutboundOrderDetailService.Repository.DeleteAndMoveIntoHty(outboundOrder.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ _outboundService.OutboundStockLockInfoService.Repository.UpdateData(outStockLockInfo);
+ Db.Ado.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -467,7 +468,23 @@
if (stockInfo.StockStatus != StockStatusEmun.鍏ュ簱涓�.ObjToInt()) throw new Exception($"鎵樼洏[{task.PalletCode}],璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault(x => x.StockId == stockInfo.Id);
-
+ if (task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt())
+ {
+ stockInfo.SerialNumber = locationInfo.CurrentQty;
+ stockInfo.InDate = DateTime.Now;
+ stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
+ stockInfoDetail.Status = StockStatusEmun.宸插叆搴�.ObjToInt();
+ locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = string.Empty;
+ Db.Ado.BeginTran();
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
+ Db.Ado.CommitTran();
+ return content;
+ }
#region 鍏ュ簱鍗�
Dt_InboundOrder inboundOrder = _inboundService.InbounOrderService.GetInboundOrder(stockInfoDetail.OrderNo);
if (inboundOrder == null || inboundOrder.Details == null) throw new Exception($"鏈壘鍒版墭鐩榌{task.PalletCode}]鐨勫叆搴撳崟鏄庣粏淇℃伅");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/InEmpty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/InEmpty.vue"
index 6401c51..1e25bad 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/InEmpty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/InEmpty.vue"
@@ -58,7 +58,7 @@
res => {
if (res.status) {
this.$refs.uToast.show({
- title: "鎴愬姛",
+ title: "绌烘墭鍏ュ簱鐢宠鎴愬姛",
type: "success"
})
this.barcode = "";
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/index.vue"
index 1f6ff97..269109a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/index.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/index.vue"
@@ -101,7 +101,7 @@
}
},
PdaOutEmpty(){
- this.$u.post('/api/PDA/PdaOutEmpty').then(
+ this.$u.post('/api/PDA/OutEmpty').then(
res => {
if (res.status) {
this.$refs.uToast.show({
--
Gitblit v1.9.3