From c283573b53247033cf83b8fcddd8a022ea6454ab Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 08:20:38 +0800
Subject: [PATCH] 修改测试问题
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 3
Admin.NET/WCS.Application/Util/HttpService.cs | 68 ++++++++++++++++
Admin.NET/WCS.Application/Model/TaskRequest.cs | 134 +++++++++++++++++++++++++++++++++
3 files changed, 203 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Model/TaskRequest.cs b/Admin.NET/WCS.Application/Model/TaskRequest.cs
index 3767fa9..0fb9341 100644
--- a/Admin.NET/WCS.Application/Model/TaskRequest.cs
+++ b/Admin.NET/WCS.Application/Model/TaskRequest.cs
@@ -1,4 +1,6 @@
锘�
+using WCS.Application.Entity;
+
namespace WCS.Application;
public class TaskRequest
{
@@ -99,3 +101,135 @@
}
+//鎴愬搧鐮佸灈淇℃伅
+public class BoxPalletBindVm
+{
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ public string OrderCode { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ public string AsnNo { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁�
+ /// </summary>
+ public int AsnDetailNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PalletNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ /// <summary>
+ /// 鎵樼洏绫诲瀷 0鐗╂枡鎵� 1绌烘墭鐩樻墭
+ /// </summary>
+ public string Type { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鎵规鎻忚堪
+ /// </summary>
+ public string LotText { get; set; }
+ /// <summary>
+ /// 渚涜揣鎵规
+ /// </summary>
+ public string SupplierLot { get; set; }
+ public List<WcsBoxInfo> Detail { get; set; }
+}
+//鐮佸灈绠辩爜鏄庣粏淇℃伅
+public class BoxPalletBindDetailVm
+{
+ /// <summary>
+ /// 鐢熶骇鍗曟嵁鍙�
+ /// </summary>
+ public string OrderCode { get; set; }
+ /// <summary>
+ /// 绠卞彿
+ /// </summary>
+ public string BoxNo { get; set; }
+ /// <summary>
+ /// 鐩掑彿
+ /// </summary>
+ public string BoxNo2 { get; set; }
+ /// <summary>
+ /// 鏀彿
+ /// </summary>
+ public string BoxNo3 { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ /// <summary>
+ /// 婊＄鏁伴噺
+ /// </summary>
+ public decimal FullQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string SkuName { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鎵规鎻忚堪
+ /// </summary>
+ public string LotText { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public DateTime? ProductionTime { get; set; }
+ /// <summary>
+ /// 杩囨湡鏃堕棿
+ /// </summary>
+ public DateTime? ExpirationTime { get; set; }
+ /// <summary>
+ /// 妫�楠屾爣璁�
+ /// </summary>
+ public string InspectMark { get; set; }
+ /// <summary>
+ /// 闆剁鏍囪
+ /// </summary>
+ public string BitBoxMark { get; set; }
+ /// <summary>
+ /// 璐ㄦ鐘舵��
+ /// </summary>
+ public string InspectStatus { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public string Standard { get; set; }
+ /// <summary>
+ /// 鍖呰瑙勬牸
+ /// </summary>
+ public string PackageStandard { get; set; }
+ /// <summary>
+ /// 鍌ㄥ瓨鏈熻嚦
+ /// </summary>
+ public DateTime? StoreTime { get; set; }
+ /// <summary>
+ /// 绗嚑浠�
+ /// </summary>
+ public int? QtyOrd { get; set; }
+ /// <summary>
+ /// 鎬讳欢鏁�
+ /// </summary>
+ public int? QtyCount { get; set; }
+
+}
+
+
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index a9e5568..740df09 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1694,7 +1694,8 @@
// 鍚慦MS鐢宠宸烽亾
var http = new HttpService();
string TaskNo = "", EndLocate = "";
- string strMsg = http.RequestRoadWay(palletNo, modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
+ string strMsg = http.BindRequestRoadWay(checkTaskMedel.OrderNo,palletNo, checkTaskMedel.BoxCount.ToDecimal(),"0", checkTaskMedel.SkuNo, checkTaskMedel.LotNo, "","", boxInfoList,
+ modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
if (!strMsg.Contains("-1"))
{
Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 5a894d5..b462687 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -1,8 +1,10 @@
-锘縰sing Elastic.Clients.Elasticsearch;
+锘縰sing DocumentFormat.OpenXml.EMMA;
+using Elastic.Clients.Elasticsearch;
using Furion.Logging;
using Furion.RemoteRequest.Extensions;
using Newtonsoft.Json;
using System.Text;
+using WCS.Application.Entity;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionResponse.Types;
namespace WCS.Application;
@@ -86,6 +88,70 @@
}
/// <summary>
+ /// 璋冪敤WMS鎺ュ彛鑷姩鐮佸灈缁戝畾淇℃伅杩斿洖宸烽亾鍙�
+ /// </summary>
+ /// <returns></returns>
+ public string BindRequestRoadWay(string orderNo, string palletNo,decimal qty ,string type,string skuNo, string lotNo, string lotText, string supplierLot, List<WcsBoxInfo> detail,
+ string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
+ {
+ string returnStr = "";
+
+ var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo);
+ if (task == null)
+ {
+ var model = new BoxPalletBindVm()
+ {
+ OrderCode= orderNo,
+ AsnNo= orderNo,
+ AsnDetailNo=0,
+ PalletNo=palletNo,
+ Qty= qty,
+ Type=type,
+ SkuNo=skuNo,
+ LotNo= lotNo,
+ LotText= lotText,
+ SupplierLot= supplierLot,
+ Detail=detail
+ };
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/BindRequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+ if (result.Success == 0)
+ {
+ var taskAdd = new WcsTask()
+ {
+ TaskType = TaskTypeEnum.In,
+ Status = TaskStatusEnum.Wait,
+ Origin = "WMS",
+ StartLocate = startLocat,
+ PalletNo = palletNo,
+ TaskNo = result.TaskList.TaskNo,
+ EndLocate = result.TaskList.EndLocate,
+ EndRoadway = result.TaskList.EndRoadway
+ };
+
+ _db.Insertable(taskAdd).ExecuteCommand();
+ endLocat = result.TaskList.EndRoadway;
+ returnStr = result.TaskList.EndLocate;
+ }
+ else
+ {
+ returnStr = "-1:" + result.Message;
+ return returnStr;
+ }
+ }
+ else
+ {
+ returnStr = task.EndLocate;
+ endLocat = task.EndRoadway;
+ taskNo = task.TaskNo;
+ }
+
+ endLocat = PLCCommon.RoadwayToStationNum(endLocat, ceng);
+
+ return returnStr;
+ }
+ /// <summary>
/// 璋冪敤WMS鎺ュ彛鐢宠鍌ㄤ綅鎺ュ彛
/// </summary>
/// <param name="palletNo"></param>
--
Gitblit v1.8.0