From 3b4ab19a4b05e098e971746c692a0d012fde7445 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期五, 26 九月 2025 17:49:12 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index dce0887..4b2d6de 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -100,8 +100,8 @@
}
Enum type;
var bale = "0";
- var nqty = "0";
- var ncomqty = "0";
+ decimal nqty = 0;
+ decimal ncomqty = 0;
if (models.TaskType == "0" )
{
type = TaskTypeEnum.In;
@@ -121,11 +121,11 @@
}
if (!string.IsNullOrEmpty( models.Qty))
{
- nqty = models.Qty;
+ nqty =Convert.ToDecimal(models.Qty);
}
if (!string.IsNullOrEmpty(models.CompleteQty))
{
- nqty = models.CompleteQty;
+ ncomqty = Convert.ToDecimal(models.CompleteQty);
}
//鏂板浠诲姟
var taskAdd = new WcsTask()
@@ -136,18 +136,20 @@
//IsSuccess =TaskSuccessEnum.Success,
Levels = 999,
Origin = "WMS",
- StartRoadway= models.StartRoadway,
+ StartRoadway = models.StartRoadway,
StartLocate = models.StartLocate,
EndLocate = models.EndLocate,
- EndRoadway= models.EndRoadway,
+ EndRoadway = models.EndRoadway,
PalletNo = models.PalletNo,
IsBale = bale,
LotNo = models.LotNo,
SkuName = models.SkuName,
- Qty = int.Parse(nqty),
- CompleteQty = int.Parse(ncomqty)
+ Qty = nqty,
+ CompleteQty = ncomqty,
+
+ OrderNo = models.OrderNo
};
_db.Insertable(taskAdd).ExecuteCommand();
@@ -590,7 +592,7 @@
/// <returns>鍙嶉淇℃伅</returns>
[HttpPost]
[AllowAnonymous]
- public IsBaleModel2 HttpInRequest(PortRequestModel models)
+ public ResponseModel HttpInRequest(PortRequestModel models)
{
try
{
@@ -629,17 +631,23 @@
plcConn.SetPlcDBValue(modDevice.PosType, listPlcDevice.DbNumber, modDevice.PlcPos, models.TaskNo);//鍐欏叆浠诲姟鍙�
//
modDevice = _db.Queryable<WcsPosition>().Where(s => s.StationNum == portno && s.Text == "WCS").First();
+ //鍒ゆ柇褰撳墠鐘舵�佹槸鍚﹁PLC璁剧疆涓�150锛屽鏋滄槸鍒欏洖浼燱MS鍙斁璐т俊鍙�
+ //var (djRes, djVal) = plcConn.GetPlcDBValue(modDevice.PosType, listPlcDevice.DbNumber, modDevice.PlcPos);
+ //if (djVal == "150")
+ //{
+ // return new ResponseModel() { StatusCode = 0, Msg = "PLC鍏佽鏀捐揣" };
+ //}
var ret = plcConn.SetPlcDBValue(modDevice.PosType, listPlcDevice.DbNumber, modDevice.PlcPos, "140");//鍐欏叆寮�濮嬫斁璐т俊鍙�
- if (ret.IsSucceed)
+ if (ret.IsSucceed == true)
{
- //鍥炰紶WMS鏀捐揣淇″彿
- return new IsBaleModel2() { Success = 0, Message = "鎺ュ彈鎴愬姛" };
+ return new ResponseModel() { StatusCode = 0, Msg = "PLC鍏佽鏀捐揣" };
}
- return new IsBaleModel2() { Success = -1, Message = "璇诲彇PLC鐐逛綅淇℃伅澶辫触" };
+
+ return new ResponseModel() { StatusCode = -1, Msg = "璇诲彇PLC鐐逛綅淇℃伅澶辫触" };
}
catch (Exception ex)
{
- return new IsBaleModel2() { Success = -1, Message = ex.Message };
+ return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
}
}
--
Gitblit v1.8.0