From b4083a6b047fc9e0964133c87227213c5154e37a Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期三, 15 一月 2025 15:47:44 +0800
Subject: [PATCH] 11111111
---
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 82 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index 6de853a..a56718c 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -85,7 +85,7 @@
result.Msg = "浠诲姟:" + models.TaskNo + ";宸插瓨鍦�!";
return result;
}
- if (models.TaskType == "0")
+ if (models.TaskType == "0" && models.TaskType == "0")
{
models.Order = 1;
}
@@ -93,11 +93,30 @@
{
models.Order = 2;
}
+ Enum type;
+ var bale = "0";
+ if (models.TaskType == "0" )
+ {
+ type = TaskTypeEnum.In;
+ }
+ else if (models.TaskType == "1")
+ {
+ type = TaskTypeEnum.Out;
+ }
+ else if (models.TaskType == "3")
+ {
+ type = TaskTypeEnum.In;
+ bale = "1";//瑁瑰寘
+ }
+ else
+ {
+ type = TaskTypeEnum.Move;
+ }
//鏂板浠诲姟
var taskAdd = new WcsTask()
{
TaskNo = models.TaskNo,
- TaskType = TaskTypeEnum.Out,
+ TaskType = (TaskTypeEnum?)type,
Status = TaskStatusEnum.Wait,
//IsSuccess =TaskSuccessEnum.Success,
Levels = 999,
@@ -107,6 +126,8 @@
EndLocate = models.EndLocate,
EndRoadway= models.EndRoadway,
PalletNo = models.PalletNo,
+ IsBale = bale,
+
//LotNo =models.LotNo,
//SkuNo=models.SkuNo,
@@ -124,7 +145,7 @@
}
/// <summary>
- /// WCS鎺ユ敹WMS涓嬪彂鐨勫叆搴撳崟浠诲姟
+ /// WCS鎺ユ敹WMS涓嬪彂鐨勫嚭鍏ュ簱鍗曚换鍔�
/// </summary>
/// <param name="models"></param>
/// <returns></returns>
@@ -137,12 +158,17 @@
{
foreach (var item in models)
{
+ string str = JsonConvert.SerializeObject(models);
+ Log.Information("鎺ユ敹WMS鎺ㄩ�佺殑绠辩爜淇℃伅锛�" + str);
// 楠岃瘉浠诲姟鏄惁宸插瓨鍦�
//var taskInfo = _db.Queryable<WcsOderTask>().First(w => w.OrderNo == item.OrderNo && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
//if (taskInfo == null)
//{
- var orderAdd = new WcsOderTask()
+ //var taskid = _db.Queryable<WcsOderTask>().OrderByDescending(w=>w.CreateTime).First();
+ //int newid = (int)taskid.Id + 1;
+ var orderAdd = new WcsOderTask()
{
+
OrderNo = item.OrderNo,
TaskNo = "",
LotNo = item.LotNo,
@@ -151,6 +177,7 @@
BoxType = item.BoxType,
Qty = item.Qty,
TaskType = (TaskTypeEnum)item.TaskType,
+ CreateTime = DateTime.Now,
};
_db.Insertable(orderAdd).ExecuteCommand();
//}
@@ -210,7 +237,7 @@
}
if (item.DelistList2.Count == 0)
{
- throw new Exception("鍊肩爜闆嗗悎涓嶈兘涓虹┖");
+ throw new Exception("鏀爜闆嗗悎涓嶈兘涓虹┖");
}
//浜岀骇鐮�
foreach (var item2 in item.DelistList2)
@@ -227,6 +254,11 @@
{
throw new Exception("鐢熶骇鏃ユ湡鎴栧け鏁堟棩鏈熸牸寮忛敊璇�");
};
+ DateTime? stortime = null;
+ if (!string.IsNullOrWhiteSpace(models.StoreTime))
+ {
+ stortime = DateTime.Parse(models.StoreTime);
+ }
var boxAdd = new WcsBoxInfo()
{
@@ -244,7 +276,7 @@
//InspectStatus = models.InspectStatus锛�
ProductionTime = proTime,
ExpirationTime = expTime,
- StoreTime = DateTime.Parse(models.StoreTime),
+ StoreTime = stortime,
EndLotFlag = string.IsNullOrWhiteSpace(models.EndBatchMark) ? "0" : models.EndBatchMark,
BoxNo2 = item.BoxNo2,
@@ -276,4 +308,42 @@
}
}
+ /// <summary>
+ /// WCS鎺ュ彈璧嬬爜绯荤粺鎺ㄩ�佺殑绠辩爜绉婚櫎
+ /// </summary>
+ /// <param name="models">绠辩爜淇℃伅</param>
+ /// <returns>鍙嶉淇℃伅</returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public ResponseFuMaModel DelgatesHttpBoxInfo(FumaBoxInfoInput models)
+ {
+
+ try
+ {
+ string str = JsonConvert.SerializeObject(models);
+ Log.Information("鎺ユ敹璧嬬爜鎺ㄩ�佺殑绠辩爜绉婚櫎锛�" + str);
+ var num = _db.Queryable<WcsBoxInfo>().Where(m => m.BoxNo == models.BoxNo && m.IsDelete == false).ToList();
+ if (num.Count > 0)
+ {
+ //WCS瀛樺湪绠辩爜淇℃伅锛屾洿鏂扮鐮佷俊鎭�(闇�鍒ゆ柇绠辩爜鏄惁宸茬粍鐩樺叆搴�)
+ var num2 = num.Count(m => m.Status != "0" || !string.IsNullOrWhiteSpace(m.PalletNo));
+ if (num2 > 0)
+ {
+ throw new Exception("璇ョ宸茬洏鍏ュ簱锛屼笉鍙洿鏂颁俊鎭�");
+ }
+ }
+ if (num.Count == 0)
+ {
+ throw new Exception("鏈壘鍒拌绠辩爜锛岀鐮佺Щ闄ゅけ璐ワ紒");
+ }
+
+ _db.Deleteable(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