From 17ede350f6cc2be9059a08a90e21de79c296648c Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 14 八月 2025 17:35:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_PdaService
---
service/Warehouse/MesInvItemInCDetailsManager.cs | 3 ++-
Controllers/Warehouse/MesInvItemInCDetailsController.cs | 48 +++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/Controllers/Warehouse/MesInvItemInCDetailsController.cs b/Controllers/Warehouse/MesInvItemInCDetailsController.cs
index 026df77..cd8533d 100644
--- a/Controllers/Warehouse/MesInvItemInCDetailsController.cs
+++ b/Controllers/Warehouse/MesInvItemInCDetailsController.cs
@@ -98,27 +98,65 @@
}
}
- //SaveBarCodes
+ /* //SaveBarCodes
+ [HttpPost("SaveBarCodes")]
+ public ResponseResult SaveBarCodes(WarehouseQuery entity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.SaveBarCodes(entity);
+ return new ResponseResult
+ {
+ status = 0,
+ message = resultInfos.tbBillList.Message,
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }*/
[HttpPost("SaveBarCodes")]
public ResponseResult SaveBarCodes(WarehouseQuery entity)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SaveBarCodes(entity);
+ var itemInBaseModel = m.SaveBarCodes(entity);
+ resultInfos.tbBillList = itemInBaseModel;
+
+ // 鍒ゆ柇鏄惁涓哄け璐ョ姸鎬侊紙result <= 0锛�
+ if (itemInBaseModel.SumQuantity == null || itemInBaseModel.SumQuantity <= 0)
+ {
+ return new ResponseResult
+ {
+ status = 1, // 澶辫触鐘舵��
+ message = itemInBaseModel.Message,
+ data = resultInfos
+ };
+ }
+
+ // 鎴愬姛鐘舵��
return new ResponseResult
{
status = 0,
- message = resultInfos.tbBillList.Message,
+ message = itemInBaseModel.Message,
data = resultInfos
};
}
catch (Exception ex)
{
- return ResponseResult.ResponseError(ex);
+ // 寮傚父鏃惰繑鍥瀞tatus = 1
+ return new ResponseResult
+ {
+ status = 1,
+ message = $"鎿嶄綔澶辫触: {ex.Message}",
+ data = null
+ };
}
}
-
//MesToErp
[HttpPost("SaveMessageCenter")]
public ResponseResult SaveMessageCenter(WarehouseQuery entity)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 574f36f..c09294b 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -117,7 +117,7 @@
res.ItemBarCDetails = Db.Ado.SqlQuery<dynamic>(sql2);
// 璁剧疆杩斿洖淇℃伅
- res.Message = outMessage;
+ res.Message = outMessage;
res.SumQuantity = result;
return res;
@@ -128,6 +128,7 @@
// 璁板綍寮傚父鏃ュ織锛堝缓璁坊鍔犳棩蹇楄褰曪級
res.Message = $"鎿嶄綔澶辫触: {ex.Message}";
+ res.SumQuantity = -1;
return res;
}
}
--
Gitblit v1.9.3