From d03c33eeebd11111ee6c116b35ccf8cd7372de8d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 15 四月 2025 12:57:37 +0800
Subject: [PATCH] 提料信息Excel导入：根据宝工客户进行调整
---
WebAPI/Controllers/QC_POStockInCheckBillController.cs | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/QC_POStockInCheckBillController.cs b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
index edae5dd..837df64 100644
--- a/WebAPI/Controllers/QC_POStockInCheckBillController.cs
+++ b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -33,7 +34,8 @@
public object GetPOStockInCheckBill(string sWhere,string user)
{
try
- {
+ {
+ List<object> a = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Query", 1, false, user))
{
@@ -45,11 +47,17 @@
}
ds = QC_POStockInCheckBill(sWhere);
-
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list=a;
return objJsonResult;
}
catch (Exception ex)
@@ -85,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 = "涓嶅瓨鍦ㄧ粨绠楀崟鍙�" };
@@ -103,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";
@@ -132,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();
//淇濆瓨涓昏〃
@@ -184,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