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 | 4 +++-
WebAPI/Controllers/SRM_MaterialBarCodeBillController.cs | 6 +++---
WebAPI/WebAPI.csproj | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/MaterialHandingController.cs b/WebAPI/Controllers/MaterialHandingController.cs
index 3c4e922..324b55c 100644
--- a/WebAPI/Controllers/MaterialHandingController.cs
+++ b/WebAPI/Controllers/MaterialHandingController.cs
@@ -369,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"]);
@@ -430,6 +431,7 @@
}
catch (Exception e)
{
+ LogService.Write("閫佽揣鐗╂枡淇℃伅淇濆瓨寮傚父锛�" + e.Message);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SRM_MaterialBarCodeBillController.cs b/WebAPI/Controllers/SRM_MaterialBarCodeBillController.cs
index 4eeceed..2ae1922 100644
--- a/WebAPI/Controllers/SRM_MaterialBarCodeBillController.cs
+++ b/WebAPI/Controllers/SRM_MaterialBarCodeBillController.cs
@@ -241,7 +241,7 @@
"HBatchNo, HBarcodeQtys, HBarcodeNo, HSupID, HGroupID, HMaker, HMakeDate, HPrintQty, HEndQty, HSupflag, " +
"HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HMTONO, HProduceDate, HExpiryDate, HISKFPERIOD) " +
"VALUES (" +
- linterid.ToString() + ", '" + TM + "', '" + HBarCodeType + "', " + HMaterID + ", " + "0" + ", " + HQty + ", '" + HKFDate + "', " + HKFPeriod + ", '" + HKFDQDate + "', " +
+ linterid.ToString() + ", '" + TM + "', '" + HBarCodeType + "', " + HMaterID + ", " + "0" + ", " + currentQty + ", '" + HKFDate + "', " + HKFPeriod + ", '" + HKFDQDate + "', " +
"'" + HBatchNo + "', " + get_BarCodecount + ", '" + virtualCount + "', " + HSupID + ", " + "0" + ", '" + ClsPub.CurUserName + "', '" + DateTime.Today.ToString("yyyy-MM-dd") + "', " + "1" + ", " + "0" + ", 1, " +
"1, 1, '1', '" + HSourceBillType + "', '1', '" +
HKFDate + "', '" + HKFDQDate + "', " + HISKFPERIOD + ")";
@@ -258,7 +258,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鐢熸垚鏉＄爜鎴愬姛锛�";
- objJsonResult.data = generatedBarcodes; // 杩斿洖鐢熸垚鐨勬潯鐮佸垪琛�
+ objJsonResult.data =string.Join("~", generatedBarcodes); // 杩斿洖鐢熸垚鐨勬潯鐮佸垪琛�
WebAPIController.Add_Log("鏉＄爜涓嬫帹", UserName, "鐢熸垚鏉＄爜");
return objJsonResult;
}
@@ -342,7 +342,7 @@
}
// 灏嗛�楀彿鍒嗛殧鐨勬潯鐮佽浆鎹负SQL IN鏌ヨ鏉′欢
- var barcodeList = barcodes.Split(',');
+ var barcodeList = barcodes.Split('~');
// 鏋勫缓IN瀛愬彞锛屼负姣忎釜鏉＄爜娣诲姞鍗曞紩鍙�
var inValues = new List<string>();
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6f8a00a..cf947dc 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -102,7 +102,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.1.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\NewtonsoftJson\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\..\鏅轰簯SRM\Newtonsoft鏂囦欢\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.dll</HintPath>
--
Gitblit v1.9.1