From 6f666387d387814b08f8a16e0426d78e5d4d4fb6 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 10 十二月 2025 09:26:14 +0800
Subject: [PATCH] 工控报工接口修改
---
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-shm | 0
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-shm | 0
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0
WebApi/Gs.Wom/BaoGong/BaoGongController.cs | 9 +++++++--
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-wal | 0
WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-wal | 0
6 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-shm b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-shm
index f584964..975c3ee 100644
--- a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-shm
+++ b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-shm
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-wal b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-wal
index b9e4e9d..15ca881 100644
--- a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-wal
+++ b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/CodeChunks.db-wal
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
index 157ede8..0c9cad3 100644
--- a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
+++ b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-shm b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-shm
index d16f378..a2ef913 100644
--- a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-shm
+++ b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-shm
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-wal b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-wal
index d5d780e..da75e18 100644
--- a/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-wal
+++ b/WebApi/.vs/GsMesSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db-wal
Binary files differ
diff --git a/WebApi/Gs.Wom/BaoGong/BaoGongController.cs b/WebApi/Gs.Wom/BaoGong/BaoGongController.cs
index 491e995..30656bc 100644
--- a/WebApi/Gs.Wom/BaoGong/BaoGongController.cs
+++ b/WebApi/Gs.Wom/BaoGong/BaoGongController.cs
@@ -176,6 +176,8 @@
dynamic m = new ExpandoObject();
m.outSum = -1;
m.outMsg = "";
+ m.barcode = "";//鏉＄爜,鍓嶇鎵撳嵃鐢�
+ m.barcodeGuid = "";//鏉＄爜guid,鍓嶇鎵撳嵃鐢�
SqlParameter[] parameters =
{
new("@inOrderGuid", _inOrderGuid),
@@ -195,14 +197,17 @@
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0)
{
- if (dset.Tables.Count != 3)
+ if (dset.Tables.Count !=4)
{
m.outSum = -1;
m.outMsg = dset.Tables[0].Rows[0]["msgTxt"].ToString();
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, m.outMsg);
}
#region 鍐嶈皟鐢� prc_pda_scbg
- string pi_barcode = dset.Tables[1].Rows[0]["ITEM_BARCODE"].ToString();
+ string pi_barcode = dset.Tables[1].Rows[0]["鐗╂枡鏉＄爜"].ToString();
+ string pi_barcodeGuid= dset.Tables[1].Rows[0]["鏉＄爜guid"].ToString();
+ m.barcode = pi_barcode;
+ m.barcodeGuid = pi_barcodeGuid;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("prc_pda_scbg", conn))
--
Gitblit v1.9.3