From a5cde4a681249e2027dd44896e33843395fce64b Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期六, 27 九月 2025 10:46:06 +0800
Subject: [PATCH] 修改托盘自动绑定
---
Admin.NET/WCS.Application/Util/HttpService.cs | 24 +++++++++++
Admin.NET/WCS.Application/Model/TaskRequest.cs | 72 +++++++++++++++++++++++++++++++++++
2 files changed, 94 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Model/TaskRequest.cs b/Admin.NET/WCS.Application/Model/TaskRequest.cs
index 54d15bf..6cc2dac 100644
--- a/Admin.NET/WCS.Application/Model/TaskRequest.cs
+++ b/Admin.NET/WCS.Application/Model/TaskRequest.cs
@@ -139,6 +139,14 @@
/// </summary>
public decimal Qty { get; set; }
/// <summary>
+ /// 绠辨暟閲�
+ /// </summary>
+ public decimal xQty { get; set; }
+ /// <summary>
+ /// 婊＄鏁伴噺
+ /// </summary>
+ public decimal FullQty { get; set; }
+ /// <summary>
/// 鎵樼洏绫诲瀷 0鐗╂枡鎵� 1绌烘墭鐩樻墭
/// </summary>
public string Type { get; set; }
@@ -146,6 +154,10 @@
/// 鐗╂枡缂栫爜
/// </summary>
public string SkuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string SkuName { get; set; }
/// <summary>
/// 鎵规鍙�
/// </summary>
@@ -158,7 +170,47 @@
/// 渚涜揣鎵规
/// </summary>
public string SupplierLot { get; set; }
- public List<WcsBoxInfo> Detail { 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; }
+ public List<BindBox> Detail { get; set; }
}
//鐮佸灈绠辩爜鏄庣粏淇℃伅
public class BoxPalletBindDetailVm
@@ -601,3 +653,21 @@
/// </summary>
public string TaskNo { get; set; }
}
+
+//鑷姩鐮佸灈缁勭洏淇℃伅鍥炰紶
+public class BindBox
+{
+ /// <summary>
+ /// 绠辩爜
+ /// </summary>
+ public string? BoxNo { get; set; }
+ /// <summary>
+ /// 鐩掔爜
+ /// </summary>
+ public string? BoxNo2 { get; set; }
+
+ /// <summary>
+ /// 鏀爜
+ /// </summary>
+ public string? BoxNo3{ get; set; }
+}
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index ad11265..08c0ffe 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -108,6 +108,15 @@
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 box = new BindBox();
+ List<BindBox> bindBox = new List<BindBox>();
+ foreach (var item in detail)
+ {
+ box.BoxNo = item.BoxNo;
+ box.BoxNo2 = item.BoxNo2;
+ box.BoxNo3 = item.BoxNo3;
+ bindBox.Add(box);
+ }
var model = new BoxPalletBindVm()
{
OrderCode = "",//鏆傛棤涓婃父绯荤粺缂栧彿
@@ -115,12 +124,25 @@
AsnDetailNo = 0,//鏆傛棤鍏ュ簱鍗曟槑缁嗙紪鍙凤紝WMS鏍规嵁鐗╂枡鎵规鏌ユ壘
PalletNo = palletNo,
Qty = qty,
+ xQty = (decimal)detail[0].Qty,
+ FullQty = (decimal)detail[0].FullQty,
Type = type,
SkuNo = skuNo,
+ SkuName = detail[0].SkuName,
LotNo = lotNo,
LotText = lotText,
SupplierLot = supplierLot,
- Detail = detail
+ ProductionTime = detail[0].ProductionTime,
+ ExpirationTime = detail[0].ExpirationTime,
+ InspectMark = detail[0].InsPectMark,
+ BitBoxMark = detail[0].BitBoxMark,
+ InspectStatus = "",
+ Standard = detail[0].Standard,
+ PackageStandard = detail[0].PackageStandard,
+ StoreTime = detail[0].StoreTime,
+ QtyOrd = detail[0].QtyOrd,
+ QtyCount = detail[0].QtyCount,
+ Detail = bindBox
};
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
var result = (url + "/api/DownAPi/BindRequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
--
Gitblit v1.8.0