From 48d66a079c307356997fb400d27907ff6d363b7b Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期一, 20 一月 2025 08:35:37 +0800
Subject: [PATCH] 修改2楼分拣和1楼拆垛时获取拆垛信息接口
---
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index a56718c..67583ce 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -1,4 +1,5 @@
-锘縰sing DocumentFormat.OpenXml.Presentation;
+锘縰sing Dm.filter;
+using DocumentFormat.OpenXml.Presentation;
using Elastic.Clients.Elasticsearch;
using Furion.Logging;
using Newtonsoft.Json;
@@ -178,6 +179,7 @@
Qty = item.Qty,
TaskType = (TaskTypeEnum)item.TaskType,
CreateTime = DateTime.Now,
+ Status = TaskStatusEnum.Wait,
};
_db.Insertable(orderAdd).ExecuteCommand();
//}
@@ -268,6 +270,7 @@
SkuName = models.SkuName,
Standard = models.Standard,
LotNo = models.LotNo,
+ LineNo = models.LineNo, // 浜х嚎鍙锋垨浜х嚎鍚嶇О
Qty = item2.Qty,
FullQty = models.FullQty,
//SupplierLot = models.SupplierLot,
@@ -283,7 +286,7 @@
BoxNo3 = item2.BoxNo3,
QtyCount = item2.QtyCount,
QtyOrd = item2.QtyOrd,
-
+
Status = "0",
Level = level,
@@ -346,4 +349,53 @@
}
}
+ /// <summary>
+ /// WCS鎺ュ彈璧嬬爜绯荤粺鎺ㄩ�佺殑缁撴壒鎬绘暟閲�
+ /// </summary>
+ /// <param name="models">缁撴壒鏁伴噺淇℃伅</param>
+ /// <returns>鍙嶉淇℃伅</returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public ResponseFuMaModel HttpTotalNum(FumaJiepiModel models)
+ {
+
+ try
+ {
+ string str = JsonConvert.SerializeObject(models);
+ Log.Information("鎺ユ敹璧嬬爜鎺ㄩ�佺殑瀹屽伐缁撴壒鎬绘暟閲忥細" + str);
+ //鏌ョ湅璧嬬爜涓嬪彂鐨勪换鍔′俊鎭槸鍚︽鍦ㄥ垎鎷�
+ var num = _db.Queryable<WcsCheckTask>().Where(m => m.SkuNo == models.SkuNo &&m.LotNo == models.LotNo && m.Status == "1").ToList();
+ if (num.Count < 1)
+ {
+ return new ResponseFuMaModel() { Success = "-1", Message = "璇ユ壒娆℃湭杩涜鍒嗘嫞鎴栧凡缁撴壒" };
+ }
+
+ //鑾峰彇鍖呰鏁伴噺
+ int Fqty = int.Parse(models.FinishQty);
+ var boxinfolog = _db.Queryable<WcsBoxInfoLog>().Where(m => m.SkuNo == models.SkuNo && m.LotNo == models.LotNo && m.BitBoxMark == "0").First();
+ if (boxinfolog == null)
+ {
+ var boxinfo = _db.Queryable<WcsBoxInfo>().Where(m => m.SkuNo == models.SkuNo && m.LotNo == models.LotNo && m.BitBoxMark == "0").First();
+ Fqty = (int)(Fqty /boxinfo.QtyCount);
+ }
+ else
+ {
+ Fqty = (int)(Fqty / boxinfolog.QtyCount);
+ }
+
+ //鍐欏叆璇ヤ换鍔″畬鎴愭暟閲�
+ foreach (var item in num)
+ {
+ item.FinishQty = Fqty;
+ }
+ _db.Updateable(num).ExecuteCommand();
+
+ return new ResponseFuMaModel() { Success = "0", Message = "鎺ュ彈瀹屽伐缁撴壒鏁伴噺鎴愬姛" };
+ }
+ catch (Exception ex)
+ {
+ return new ResponseFuMaModel() { Success = "-1", Message = ex.Message };
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0