From 951ef0297938e31101147174ee82c84316ebab96 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 10 九月 2025 02:35:02 +0800
Subject: [PATCH] json版本，条码数量逻辑
---
WebAPI/Controllers/MaterialHandingController.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/MaterialHandingController.cs b/WebAPI/Controllers/MaterialHandingController.cs
index d287e02..324b55c 100644
--- a/WebAPI/Controllers/MaterialHandingController.cs
+++ b/WebAPI/Controllers/MaterialHandingController.cs
@@ -263,13 +263,17 @@
{
//ds1鑾峰彇鐨剆ql鍚庢湡璁板緱鏀瑰洖渚涘簲鍟嗭紝淇敼浜�->渚涘簲鍟�
var ds1 = oCN.RunProcReturn("select * from h_v_Gy_UserMaterRelationEdit where 鐗╂枡浠ｇ爜='" + HMaterID + "'" + "and 淇敼浜�='" + user + "'", "h_v_Gy_UserMaterRelationEdit");
- var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + HMaterID+ "'", "Gy_Material");
-
+ var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + HMaterID+ "'"+ " and HUSEORGID="+"'"+ OrganizationID+"'", "Gy_Material");
+ if(ds.Tables[0].Rows.Count == 0)
+ {
+ return 2;
+ }
if (param == 0)
{
- if (ds1.Tables[0].Rows.Count > 0)
+ if (ds1.Tables[0].Rows.Count > 0)//鐗╂枡閲嶅锛屽脊鍑鸿闂�
{
return 1;
+
}
else
{
@@ -365,8 +369,9 @@
msg2 = "[" + msg2.ToString() + "]";
List<Model.Cls_MaterialHandingModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Cls_MaterialHandingModel>>(msg2);
+
var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + list[0].HMaterNumber + "'", "Gy_Material");
-
+
int HItemID =Convert.ToInt32(list[0].HItemID);
string HMaterNumber = list[0].HMaterNumber;
int HMaterID =Convert.ToInt32(ds.Tables[0].Rows[0]["HItemID"]);
@@ -426,6 +431,7 @@
}
catch (Exception e)
{
+ LogService.Write("閫佽揣鐗╂枡淇℃伅淇濆瓨寮傚父锛�" + e.Message);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1