From e633e0e1c7c5ca76bb720d1efcbc83dc3a18f6ea Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 15:16:13 +0800
Subject: [PATCH] 修复托数的修改问题
---
WebAPI/Controllers/MateOutController.cs | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 6943e37..5630740 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -1376,8 +1376,7 @@
public static string BuildDynamicQueryJson(string materialNumber = null, long FHStockId=0, long HOWNERID = 0)
{
// 鍒涘缓鍔ㄦ�佽繃婊ゆ潯浠跺垪琛�
- var filterList = new List<object>();
- var queryParams;
+ var filterList = new List<object>();
if (HOWNERID!= 100038)
{
// 濡傛灉鏈夌墿鏂欑紪鐮侊紝娣诲姞鐗╂枡鏉′欢
@@ -1421,27 +1420,29 @@
}
// 鏋勫缓瀹屾暣鐨勬煡璇㈠弬鏁�
- queryParams = new
+ var queryParams = new
{
FormId = "STK_Inventory",
FieldKeys = "FMaterialId,FMaterialName,FModel,FStockUnitId,FBaseQty,FStockId,FStockLocId,FLot,FAuxPropId,FProduceDate,FExpiryDate,FStockOrgId",
FilterString = filterList
};
+ return JsonConvert.SerializeObject(queryParams);
}
else
{
-
+
//47 涓嶆敮鎸佷笂闈㈢殑鍔ㄦ�佽繃婊ゆ潯浠� 鏋勫缓瀹屾暣鐨勬煡璇㈠弬鏁�
- queryParams = new
+ var queryParams1 = new
{
FormId = "STK_Inventory",
FieldKeys = "FMaterialId,FMaterialName,FModel,FStockUnitId,FBaseQty,FStockId,FStockLocId,FLot,FAuxPropId,FProduceDate,FExpiryDate,FStockOrgId",
FilterString = ""
};
+ return JsonConvert.SerializeObject(queryParams1);
}
- return JsonConvert.SerializeObject(queryParams);
+
}
#endregion
@@ -1634,7 +1635,7 @@
#endregion
- //杞﹂棿瀹氫綅 杞﹂棿涓婁笅鏋舵椂闂存煡璇�
+ #region 杞﹂棿瀹氫綅 杞﹂棿涓婁笅鏋舵椂闂存煡璇�
[Route("Kf_WorkShopICStockBill/List")]
[HttpGet]
public object Kf_WorkShopICStockBillList(string HBillType, string HCarBarCode, string HProcExBillNo, string HMaterNumber, long HWHID, long HSPID, string sWhere)
@@ -1684,7 +1685,7 @@
return objJsonResult;
}
}
-
+ #endregion
[Route("MateOutBill/Delete_Json")]
[HttpGet]
public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
@@ -3996,5 +3997,60 @@
#endregion
#endregion
+
+
+ #region 杞﹂棿瀹氫綅 杞﹂棿涓婁笅鏋舵椂闂存煡璇�
+ [Route("KF_ICInventory_WorkShop/KF_ICInventory_WorkShopList")]
+ [HttpGet]
+ public object KF_ICInventory_WorkShopList(string sWhere)
+ {// string HBarCode, string HMaterNumber, long HWHID, long HSPID,
+ try
+ {
+ DataSet ds;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> columnNameList = new List<object>();
+ if (sWhere != null)
+ {
+ //sWhere = sWhere.Replace("'", "''");
+ ds = oCN.RunProcReturn("select * from h_v_KF_ICInventory_WorkShop_WMS where 1=1 "+ sWhere, "h_v_KF_ICInventory_WorkShop_WMS");
+ }
+ else
+ ds = oCN.RunProcReturn("select * from h_v_KF_ICInventory_WorkShop_WMS where 1=1", "h_v_KF_ICInventory_WorkShop_WMS");
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1