From cee055eb7cdecf5d995cc65d379494e471bde9c8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 02 四月 2025 10:06:03 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/QC_POStockInCheckBillController.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/QC_POStockInCheckBillController.cs b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
index 4932707..837df64 100644
--- a/WebAPI/Controllers/QC_POStockInCheckBillController.cs
+++ b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
@@ -93,8 +93,9 @@
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "select top 1 * from h_v_QC_POStockInCheckBillList_Edit where hmainid= " + HID + " ";
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_QC_Edit_POStockInCheckBillList where hmainid= " + HID + " ", "h_v_QC_Edit_POStockInCheckBillList");
+ var dataSet = oCN.RunProcReturn(sql, "h_v_QC_Edit_POStockInCheckBillList");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ粨绠楀崟鍙�" };
@@ -111,9 +112,7 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql1 = "SELECT 鏃ユ湡,鍗曟嵁鍙�,琛ㄥご澶囨敞, 渚涘簲鍟嗗悕绉�,渚涘簲鍟嗕唬鐮�,浜у搧鍐呯爜" +
- ", 浜у搧鍚嶇О, 浜у搧鍨嬪彿, 妫�楠屽憳浠ｇ爜, 妫�楠屽憳鍚嶇О, 鍒跺崟浜�, 鍒跺崟鏃ユ湡, 瀹℃牳浜�" +
- ", 瀹℃牳鏃ユ湡, 淇敼浜�, 淇敼鏃ユ湡, 鍏抽棴浜�, 鍏抽棴鏃ユ湡 FROM h_v_QC_Edit_POStockInCheckBillList where 1 = 1 ";
+ string sql1 = "SELECT * FROM h_v_QC_POStockInCheckBillList_Edit where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_QC_Edit_POStockInCheckBillList");
objJsonResult.code = "0";
@@ -140,7 +139,7 @@
[HttpPost]
public object AddBill([FromBody] JObject sMainSub)
{
- var _value = sMainSub["sMainSub"].ToString();
+ var _value = sMainSub["msg"].ToString();
string msg1 = _value.ToString();
oCN.BeginTran();
//淇濆瓨涓昏〃
@@ -192,12 +191,12 @@
long HBillStatus = mainList[0].HBillStatus;
string HRemark = mainList[0].HRemark;//澶囨敞
string HBacker = mainList[0].HBacker;
- DateTime HBackDate = mainList[0].HBackDate;
+ //DateTime HBackDate = mainList[0].HBackDate;
string HBackRemark = mainList[0].HBackRemark;
string HChecker = mainList[0].HChecker;
- DateTime HCheckDate = mainList[0].HCheckDate;
+ //DateTime HCheckDate = mainList[0].HCheckDate;
string HMaker = mainList[0].HMaker;
- DateTime HMakeDate = mainList[0].HMakeDate;
+ //DateTime HMakeDate = mainList[0].HMakeDate;
long HSupID = mainList[0].HSupID;
long HMaterID = mainList[0].HMaterID;
decimal HInStockQty = mainList[0].HInStockQty;
--
Gitblit v1.9.1