From 033d6d49fbb0a924653c7fd3ef3700a24f37ee59 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:41 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/MateOutController.cs | 1553 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,519 insertions(+), 34 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 60dcf48..517102f 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -10,10 +10,12 @@
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Text.RegularExpressions;
using System.Web;
using System.Web.Http;
using WebAPI;
using WebAPI.Code;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
using static WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡.Gy_DutyBillController;
@@ -1072,10 +1074,390 @@
{
try
{
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> columnNameList = new List<object>();
+ string Ret = "";
+
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CloudMode == "Y")
+ {
+ DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventoryByMaterIDList1 '" + HBarCode + "'," + sHWHID + "," + sHSPID + "," + HOWNERID + ",'" + sWhere + "'", "h_p_KF_ICInventoryByMaterIDList");
+
+ //娣诲姞鍒楀悕
+ 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 = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ERP搴撳瓨鏌ヨ锛屽悓姝ヨ幏鍙栫櫥褰曡处鍙峰瘑鐮佸け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐧诲綍閲戣澏澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string queryJson = BuildDynamicQueryJson(HBarCode, sHWHID, HOWNERID);
+
+ string result = InvokeHelper.ExecuteBillQuery("STK_Inventory", queryJson);//鏌ヨ
+ var dataArray = JArray.Parse(result);
+
+ if (dataArray == null || dataArray.Count == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛屾棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 绗竴姝ワ細鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑ID
+ var ids = CollectIdsFromDataArray(dataArray);
+
+ // 绗簩姝ワ細鎵归噺鏌ヨ鏁版嵁搴撲腑鐨勫熀纭�淇℃伅锛堝悓姝ユ柟寮忥級
+ var stockDict = BatchQuery(oCN, "Gy_Warehouse", "HName", ids.StockIds);
+ var locationDict = BatchQuery(oCN, "Gy_StockPlace", "HName", ids.LocationIds);
+ var materialDict = BatchQuery(oCN, "Gy_Material", "HNumber", ids.MaterialIds);
+ var orgDict = BatchQuery(oCN, "Xt_ORGANIZATIONS", "HName", ids.OwnerIds);
+ var propDict = BatchQuery(oCN, "Gy_Property", "HName", ids.PropIds);
+
+ // 绗笁姝ワ細鎵归噺鏌ヨ鎵规淇℃伅锛堣皟鐢ㄩ噾铦舵帴鍙ｏ級
+ var batchDict = BatchQueryBatchInfo(ids.BatchIds);
+
+ var finalResults = new List<Dictionary<string, object>>();
+
+ // 绗洓姝ワ細澶勭悊鏁版嵁
+ foreach (JArray item in dataArray)
+ {
+ if (item.Count >= 11)
+ {
+ int HMaterID = item[0]?.Value<int>() ?? 0;
+ int HStockId = item[3]?.Value<int>() ?? 0;
+ int HLocationId = item[5]?.Value<int>() ?? 0;
+ int FAuxPropId = item[8]?.Value<int>() ?? 0;
+ int ownerId = item[11]?.Value<int>() ?? 0;
+ int FLot = item[6]?.Value<int>() ?? 0; // 鎵规ID
+
+ // 鍒涘缓缁撴灉瀛楀吀锛屼娇鐢ㄤ腑鏂囧瓧娈靛悕
+ var resultDict = new Dictionary<string, object>
+ {
+ ["鐗╂枡鍚嶇О"] = item[1].Value<string>(),
+ ["瑙勬牸鍨嬪彿"] = item[2].Value<string>(),
+ ["鏁伴噺"] = item[4].Value<decimal>(),
+
+ ["鐢熶骇鏃ユ湡"] = DBUtility.ClsPub.isDate(item[8]?.Value<string>()),
+ ["鏈夋晥鏈熻嚦"] = DBUtility.ClsPub.isDate(item[9]?.Value<string>())
+ };
+
+ // 浠庡瓧鍏歌幏鍙栦粨搴撳悕绉�
+ if (HStockId > 0 && stockDict.TryGetValue(HStockId, out string stockName))
+ resultDict["浠撳簱"] = stockName;
+ else
+ resultDict["浠撳簱"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栦粨浣嶅悕绉�
+ if (HLocationId > 0 && locationDict.TryGetValue(HLocationId, out string locationName))
+ resultDict["浠撲綅"] = locationName;
+ else
+ resultDict["浠撲綅"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栫墿鏂欎唬鐮�
+ if (HMaterID > 0 && materialDict.TryGetValue(HMaterID, out string materialCode))
+ resultDict["鐗╂枡浠ｇ爜"] = materialCode;
+ else
+ resultDict["鐗╂枡浠ｇ爜"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栫粍缁囧悕绉�
+ if (ownerId > 0 && orgDict.TryGetValue(ownerId, out string orgName))
+ resultDict["缁勭粐"] = orgName;
+ else
+ resultDict["缁勭粐"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栬緟鍔╁睘鎬у悕绉�
+ if (FAuxPropId > 0 && propDict.TryGetValue(FAuxPropId, out string propName))
+ resultDict["杈呭姪灞炴��"] = propName;
+ else
+ resultDict["杈呭姪灞炴��"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栨壒娆″悕绉�
+ if (FLot > 0 && batchDict.TryGetValue(FLot, out string batchName))
+ resultDict["鎵规"] = batchName;
+ else
+ resultDict["鎵规"] = "";
+
+ finalResults.Add(resultDict);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = finalResults.Count;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = finalResults;
+ return objJsonResult;
+ }
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region 閲戣澏鍙婃椂搴撳瓨鏌ヨ 浣跨敤鏂规硶
+
+ // 杈呭姪绫伙細鐢ㄤ簬鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑ID
+ private class CollectedIds
+ {
+ public HashSet<int> StockIds { get; set; } = new HashSet<int>();
+ public HashSet<int> LocationIds { get; set; } = new HashSet<int>();
+ public HashSet<int> MaterialIds { get; set; } = new HashSet<int>();
+ public HashSet<int> OwnerIds { get; set; } = new HashSet<int>();
+ public HashSet<int> PropIds { get; set; } = new HashSet<int>();
+ public HashSet<int> BatchIds { get; set; } = new HashSet<int>(); // 鎵规ID
+ }
+
+ // 鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑ID
+ private CollectedIds CollectIdsFromDataArray(JArray dataArray)
+ {
+ var ids = new CollectedIds();
+
+ foreach (JArray item in dataArray)
+ {
+ if (item.Count >= 11)
+ {
+ int HMaterID = item[0]?.Value<int>() ?? 0;
+ int HStockId = item[3]?.Value<int>() ?? 0;
+ int HLocationId = item[5]?.Value<int>() ?? 0;
+ int FAuxPropId = item[8]?.Value<int>() ?? 0;
+ int ownerId = item[11]?.Value<int>() ?? 0;
+ int FLot = item[6]?.Value<int>() ?? 0; // 鎵规ID
+
+ if (HStockId > 0) ids.StockIds.Add(HStockId);
+ if (HLocationId > 0) ids.LocationIds.Add(HLocationId);
+ if (HMaterID > 0) ids.MaterialIds.Add(HMaterID);
+ if (ownerId > 0) ids.OwnerIds.Add(ownerId);
+ if (FAuxPropId > 0) ids.PropIds.Add(FAuxPropId);
+ if (FLot > 0) ids.BatchIds.Add(FLot); // 鏀堕泦鎵规ID
+ }
+ }
+
+ return ids;
+ }
+
+ // 鎵归噺鏌ヨ鏂规硶锛堝悓姝ョ増鏈級
+ private Dictionary<int, string> BatchQuery(SQLHelper.ClsCN oCN, string tableName, string nameColumn, HashSet<int> ids)
+ {
+ if (ids == null || ids.Count == 0)
+ return new Dictionary<int, string>();
+
+ string idList = string.Join(",", ids);
+ string query = $"select Hitemid, {nameColumn} from {tableName} with (nolock) where Hitemid in ({idList})";
+
+ DataSet ds = oCN.RunProcReturn(query, tableName);
+ var dict = new Dictionary<int, string>();
+
+ if (ds != null && ds.Tables.Count > 0)
+ {
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ int id = Convert.ToInt32(row["Hitemid"]);
+ string name = row[nameColumn].ToString();
+ dict[id] = name;
+ }
+ }
+
+ return dict;
+ }
+
+ // 鎵归噺鏌ヨ鎵规淇℃伅锛堣皟鐢ㄩ噾铦舵帴鍙ｏ級
+ private Dictionary<int, string> BatchQueryBatchInfo(HashSet<int> batchIds)
+ {
+ var batchDict = new Dictionary<int, string>();
+
+ if (batchIds == null || batchIds.Count == 0)
+ return batchDict;
+
+ // 濡傛灉闇�瑕佸苟琛屾煡璇紝鍙互浣跨敤 Parallel.ForEach
+ // 浣嗘敞鎰忥細濡傛灉鎺ュ彛涓嶆敮鎸侀珮骞跺彂锛屽彲浠ユ敼涓洪『搴忔煡璇�
+ foreach (int batchId in batchIds)
+ {
+ try
+ {
+ // 鏋勫缓鏌ヨ鍙傛暟
+ var queryJson = $"{{\"Id\": {batchId}, \"IsSortBySeq\": \"false\"}}";
+
+ // 璋冪敤鎵规鏌ヨ鎺ュ彛
+ string result = InvokeHelper.View("BD_BatchMainFile", queryJson);
+
+ // 瑙ｆ瀽杩斿洖鐨凧SON
+ var jsonObj = JObject.Parse(result);
+
+ // 鑾峰彇鎵规鍚嶇О锛堜粠Name鏁扮粍鐨勭涓�涓厓绱犵殑Value锛�
+ var nameArray = jsonObj["Result"]?["Result"]?["Name"] as JArray;
+ if (nameArray != null && nameArray.Count > 0)
+ {
+ string batchName = nameArray[0]["Value"]?.ToString();
+ if (!string.IsNullOrEmpty(batchName))
+ {
+ batchDict[batchId] = batchName;
+ }
+ else
+ {
+ // 濡傛灉Name鏁扮粍涓病鏈夊�硷紝灏濊瘯浠嶯umber瀛楁鑾峰彇
+ string number = jsonObj["Result"]?["Result"]?["Number"]?.ToString();
+ if (!string.IsNullOrEmpty(number))
+ {
+ batchDict[batchId] = number;
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍閿欒鏃ュ織锛屼絾缁х画澶勭悊鍏朵粬鎵规
+ Console.WriteLine($"鏌ヨ鎵规淇℃伅澶辫触锛屾壒娆D: {batchId}, 閿欒: {ex.Message}");
+ // 濡傛灉鏌ヨ澶辫触锛屽彲浠ュ皢鎵规ID浣滀负榛樿鍊�
+ batchDict[batchId] = batchId.ToString();
+ }
+ }
+
+ return batchDict;
+ }
+
+ //JSON瀛楃涓插弬鏁�
+ public static string BuildDynamicQueryJson(string materialNumber = null, long FHStockId=0, long HOWNERID = 0)
+ {
+ // 鍒涘缓鍔ㄦ�佽繃婊ゆ潯浠跺垪琛�
+ var filterList = new List<object>();
+ if (HOWNERID!= 100038)
+ {
+ // 濡傛灉鏈夌墿鏂欑紪鐮侊紝娣诲姞鐗╂枡鏉′欢
+ if (!string.IsNullOrWhiteSpace(materialNumber))
+ {
+ filterList.Add(new
+ {
+ Left = "",
+ FieldName = "FHMaterID.FNumber",
+ Compare = "67", // 绛変簬
+ Value = materialNumber,
+ Right = "",
+ Logic = filterList.Count > 0 ? 1 : 0 // 濡傛灉鏈夊涓潯浠讹紝Logic=1琛ㄧずOR
+ });
+ }
+ // 濡傛灉鏈変粨搴撳悕绉帮紝娣诲姞浠撳簱鏉′欢
+ if (FHStockId != 0)
+ {
+ filterList.Add(new
+ {
+ Left = "",
+ FieldName = "FHStockId",
+ Compare = "67", // 鍖呭惈
+ Value = FHStockId,
+ Right = "",
+ Logic = filterList.Count > 0 ? 1 : 0 // 濡傛灉鏈夊涓潯浠讹紝Logic=1琛ㄧずOR
+ });
+ }
+ // 濡傛灉鏈夌粍缁嘔D锛屾坊鍔犵粍缁囨潯浠�
+ if (HOWNERID != 0)
+ {
+ filterList.Add(new
+ {
+ Left = "",
+ FieldName = "FStockOrgId",
+ Compare = "67", // 鍖呭惈
+ Value = HOWNERID, // 淇濇寔涔嬪墠鐨勭被鍨嬭浆鎹慨澶�
+ Right = "",
+ Logic = filterList.Count > 0 ? 1 : 0 // 濡傛灉鏈夊涓潯浠讹紝Logic=1琛ㄧずOR
+ });
+ }
+
+ // 鏋勫缓瀹屾暣鐨勬煡璇㈠弬鏁�
+ 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 涓嶆敮鎸佷笂闈㈢殑鍔ㄦ�佽繃婊ゆ潯浠� 鏋勫缓瀹屾暣鐨勬煡璇㈠弬鏁�
+ var queryParams1 = new
+ {
+ FormId = "STK_Inventory",
+ FieldKeys = "FMaterialId,FMaterialName,FModel,FStockUnitId,FBaseQty,FStockId,FStockLocId,FLot,FAuxPropId,FProduceDate,FExpiryDate,FStockOrgId",
+ FilterString = ""
+ };
+ return JsonConvert.SerializeObject(queryParams1);
+ }
+
+
+
+ }
+
+ #endregion
+
+ //鍒锋柊琛ㄤ綋 杞﹂棿瀹氫綅 杩斿洖杞﹂棿鍗虫椂搴撳瓨搴撳瓨淇℃伅缃戦〉PDA鐗�
+ [Route("KF_ICInventory_WorkShopByMaterID/GetWorkShopICInventory")]
+ [HttpGet]
+ public object GetWorkShopICInventory(string HBarCode, long sHWHID, long sHSPID, long HOWNERID, string sWhere)
+ {
+ try
+ {
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
List<object> columnNameList = new List<object>();
- DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventoryByMaterIDList1 '" + HBarCode + "'," + sHWHID + "," + sHSPID+","+ HOWNERID+",'"+ sWhere+"'", "h_p_KF_ICInventoryByMaterIDList");
+ DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventory_WorkShopByMaterIDList '" + HBarCode + "'," + sHWHID + "," + sHSPID + "," + HOWNERID + ",'" + sWhere + "'", "h_p_KF_ICInventory_WorkShopByMaterIDList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -1106,6 +1488,196 @@
catch (Exception e)
{
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //杞﹂棿瀹氫綅 杞﹂棿涓嬫灦搴撳瓨淇℃伅鏌ヨ
+ [Route("KF_ICInventory_WorkShop/GetWorkShopXJICInventory")]
+ [HttpGet]
+ public object GetWorkShopXJICInventory(string HCarBarCode, string HEquipBarCode, string HProcExBillNo,string HMaterNumber, long HWHID, long HSPID,string sWhere)
+ {
+ try
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> columnNameList = new List<object>();
+ DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventory_WorkShopByXJList '" + HCarBarCode + "','" + HEquipBarCode + "','" + HProcExBillNo + "','" + HMaterNumber + "'," + HWHID + "," + HSPID + ",'" + sWhere + "'", "h_p_KF_ICInventory_WorkShopByXJList");
+ //娣诲姞鍒楀悕
+ 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 = null;
+ 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;
+ }
+ }
+
+ #region 杞﹂棿瀹氫綅 杞﹂棿鏌ヨ鏉＄爜鏄惁瀛樺湪
+ [Route("KF_ICInventory_WorkShop/SearchHBarCode")]
+ [HttpGet]
+ public object checkHBarCode_Batch(string HBarCode, string user, int HOrgID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill");
+
+ //鍒ゆ柇鏉＄爜鏄惁瀛樺湪鏉＄爜妗ｆ
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]鏍￠獙鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛佸綋鍓嶆壒娆＄爜鏃犲叆搴撲俊鎭妫�鏌ユ槸鍚︽壂閿�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 杞﹂棿瀹氫綅 鍒犻櫎鏉＄爜搴撳瓨璁板綍
+ [Route("KF_ICInventory_WorkShop/ClearHBarCode")]
+ [HttpGet]
+ public object ClearHBarCode(string HBarCode, long HWHID, long HSPID, string user, int HOrgID)
+ {
+ try
+ {
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ ds = oCN.RunProcReturn($"exec h_p_KF_MaterialUpper_Clear '{HBarCode}','{HWHID}',{HSPID},'{user}',{HOrgID}", "h_p_KF_ICInventory_Clear");
+
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛岀墿鏂欎唬鐮侊細" + HBarCode + ",浠撲綅id锛�" + HSPID, user);
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ //杞﹂棿瀹氫綅 杞﹂棿涓婁笅鏋舵椂闂存煡璇�
+ [Route("Kf_WorkShopICStockBill/List")]
+ [HttpGet]
+ public object Kf_WorkShopICStockBillList(string HBillType, string HCarBarCode, string HProcExBillNo, string HMaterNumber, long HWHID, long HSPID, string sWhere)
+ {
+ try
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> columnNameList = new List<object>();
+ if(sWhere!=null)
+ {
+ sWhere = sWhere.Replace("'", "''");
+ }
+ DataSet ds = oCN.RunProcReturn("exec h_p_KF_WorkShopICStockBillList '" + HBillType + "','" + HCarBarCode + "','" + HProcExBillNo + "','" + HMaterNumber + "'," + HWHID + "," + HSPID + ",'" + sWhere + "'", "h_p_KF_WorkShopICStockBillList");
+ //娣诲姞鍒楀悕
+ 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();
@@ -1350,10 +1922,19 @@
#region 鐧藉澂鍙戝竷姹囨�绘姤琛�
[Route("MaterOutSumReport/MaterOutSumReport_Cloth")]
[HttpGet]
- public object MaterOutSumReport_Cloth(string sWhere)
+ public object MaterOutSumReport_Cloth(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_MaterOutSumReport_Cloth", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1417,10 +1998,19 @@
#region 鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃
[Route("MaterOutEntryReport/MaterOutEntryReport_Cloth")]
[HttpGet]
- public object MaterOutEntryReport_Cloth(string sWhere)
+ public object MaterOutEntryReport_Cloth(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_MaterOutEntryReport_Cloth", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1480,10 +2070,19 @@
#region 鏌撳巶姹囨�绘姤琛�
[Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor")]
[HttpGet]
- public object ProdProcessSumReport_DyeColor(string sWhere)
+ public object ProdProcessSumReport_DyeColor(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessSumReport_DyeColor", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1536,10 +2135,19 @@
#region 鏌撳巶鏄庣粏鎶ヨ〃
[Route("ProdProcessEntryReport/ProdProcessEntryReport_DyeColor")]
[HttpGet]
- public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo)
+ public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessEntryReport_DyeColor", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1585,10 +2193,19 @@
#region 鏌撳巶浜ч噺鎶ヨ〃
[Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor_third")]
[HttpGet]
- public object ProdProcessSumReport_DyeColor_third(string sWhere)
+ public object ProdProcessSumReport_DyeColor_third(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessSumReport_DyeColor_third", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1597,7 +2214,8 @@
"and (浜у搧浠ｇ爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
"and (鐢熶骇璁㈠崟鍙�=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
"and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
- "and (浜у搧瑙勬牸=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
+ "and (浜у搧瑙勬牸=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch +
+ " " + com.OtherSearch; ;
ds = oCN.RunProcReturn($"exec h_p_Kf_ProdProcessSumReport_DyeColor_third '{sql}'", "h_p_Kf_ProdProcessSumReport_DyeColor_third");
@@ -1632,10 +2250,19 @@
#region 鐑樺共瀹氬瀷鍑虹珯
[Route("ProdProcessSumReport/Kf_DryFinalizeOutReport")]
[HttpGet]
- public object Kf_DryFinalizeOutReport(string sWhere)
+ public object Kf_DryFinalizeOutReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_DryFinalizeOutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn($"select * from h_v_Kf_DryFinalizeOutReport where 1=1 "+sWhere, "h_v_Kf_DryFinalizeOutReport");
//鑾峰彇鍒楀悕
@@ -1669,10 +2296,19 @@
#region 涓婃祮瀹氬瀷鍑虹珯
[Route("ProdProcessSumReport/Kf_SizingFinalizeOutReport")]
[HttpGet]
- public object Kf_SizingFinalizeOutReport(string sWhere)
+ public object Kf_SizingFinalizeOutReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_SizingFinalizeOutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn($"select * from h_v_Kf_SizingFinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_SizingFinalizeOutReport");
//鑾峰彇鍒楀悕
@@ -1706,10 +2342,19 @@
#region 鍒锋瘺鍑虹珯
[Route("ProdProcessSumReport/Kf_BrushingOutReport")]
[HttpGet]
- public object Kf_BrushingOutReport(string sWhere)
+ public object Kf_BrushingOutReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_BrushingOutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn($"select * from h_v_Kf_BrushingOutReport where 1=1 " + sWhere, "h_v_Kf_BrushingOutReport");
//鑾峰彇鍒楀悕
@@ -1743,10 +2388,19 @@
#region 鑹插澂鐑厜鍑虹珯
[Route("ProdProcessSumReport/Kf_ColorBlankLustringOutReport")]
[HttpGet]
- public object Kf_ColorBlankLustringOutReport(string sWhere)
+ public object Kf_ColorBlankLustringOutReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_ColorBlankLustringOutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn($"select * from h_v_Kf_ColorBlankLustringOutReport where 1=1 " + sWhere, "h_v_Kf_ColorBlankLustringOutReport");
//鑾峰彇鍒楀悕
@@ -1781,46 +2435,55 @@
#region 鍘嬫按鍑虹珯 姣涘皷鍑虹珯
[Route("ProdProcessSumReport/Kf_PressurizedWaterOutReport")]
[HttpGet]
- public object Kf_PressurizedWaterOutReport(string sWhere,string HBillType)
+ public object Kf_PressurizedWaterOutReport(string sWhere,string HBillType,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log(HBillType, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
switch (HBillType)
{
- case "Kf_PressurizedWaterOutReport":
+ case "Kf_PressurizedWaterOutReport"://姣涘皷 鍘嬫按鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_PressurizedWaterOutReport where 1=1 " + sWhere, "h_v_Kf_PressurizedWaterOutReport");
break;
- case "Kf_HairtipReport":
+ case "Kf_HairtipReport"://姣涘皷 姣涘皷鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_HairtipReport where 1=1 " + sWhere, "h_v_Kf_HairtipReport");
break;
- case "Kf_DigitalSprayPaintingReport":
+ case "Kf_DigitalSprayPaintingReport"://姣涘皷 鏁扮爜鍠疯姳鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_DigitalSprayPaintingReport where 1=1 " + sWhere, "h_v_Kf_DigitalSprayPaintingReport");
break;
- case "Kf_ShrinkBrushReport":
+ case "Kf_ShrinkBrushReport"://鍚庢暣浜屽彿 缂╁埛鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushReport");
break;
- case "Kf_FinalizeTheDesignOutReport":
+ case "Kf_FinalizeTheDesignOutReport"://鍚庢暣浜屽彿 瀹氬瀷鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeTheDesignOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeTheDesignOutReport");
break;
- case "Kf_LustringOutReport":
+ case "Kf_LustringOutReport"://鍚庢暣浜屽彿 鐑厜鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringOutReport where 1=1 " + sWhere, "h_v_Kf_LustringOutReport");
break;
- case "Kf_ShrinkBrushOutReport":
+ case "Kf_ShrinkBrushOutReport"://鍚庢暣涓�鍙� 缂╁埛鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushOutReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushOutReport");
break;
- case "Kf_FinalizeOutReport":
+ case "Kf_FinalizeOutReport"://鍚庢暣涓�鍙� 瀹氬瀷鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeOutReport");
break;
- case "Kf_LustringReport":
+ case "Kf_LustringReport"://鍚庢暣涓�鍙� 鐑厜鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringReport where 1=1 " + sWhere, "h_v_Kf_LustringReport");
break;
- case "Kf_ShrinkBrushTeReport":
+ case "Kf_ShrinkBrushTeReport"://鐗规暣 缂╁埛鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushTeReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushTeReport");
break;
- case "Kf_EmbossingOutReport":
+ case "Kf_EmbossingOutReport"://鐗规暣 鍘嬭姳鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_EmbossingOutReport where 1=1 " + sWhere, "h_v_Kf_EmbossingOutReport");
break;
- case "Kf_StereoscopicFlowerOutReport":
+ case "Kf_StereoscopicFlowerOutReport"://鐗规暣 绔嬩綋鑺卞瀷鏈哄嚭绔�
ds = oCN.RunProcReturn($"select * from h_v_Kf_StereoscopicFlowerOutReport where 1=1 " + sWhere, "h_v_Kf_StereoscopicFlowerOutReport");
break;
}
@@ -1854,6 +2517,67 @@
}
#endregion
+ #region 鍘嬫按鏈嚭绔欐姤琛� 鏌ヨ
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Kf_PressurizedWaterNoOutReport/list")]
+ [HttpGet]
+ public object GetKf_PressurizedWaterNoOutReport(string sWhere, string user, string userid)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ ////鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Kf_PressurizedWaterNoOutReport_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鏌ヨ
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ string sql = "exec h_p_Kf_PressurizedWaterNoOutReport '','" + userid + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Kf_PressurizedWaterNoOutReport");
+ }
+ else
+ {
+ string sql = "exec h_p_Kf_PressurizedWaterNoOutReport '" + sWhere + "','" + userid + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Kf_PressurizedWaterNoOutReport");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 棰嗘枡缁熻鎶ヨ〃
/// <summary>
/// 棰嗘枡缁熻鎶ヨ〃
@@ -1861,10 +2585,19 @@
/// <returns></returns>
[Route("MateOutController/GetKf_MateOutSumReport_QiaoYi_Json")]
[HttpGet]
- public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere)
+ public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_MateOutSumReport_QiaoYi", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("exec h_p_Kf_MateOutSumReport_QiaoYi " + sWhere, "h_p_Kf_MateOutSumReport_QiaoYi");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -1909,10 +2642,20 @@
#region (鐢熶骇璁㈠崟缁村害)瀹㈡埛璁㈠崟鎶ヨ〃
[Route("MaterOutEntryReport/sc_ICOMReportList")]
[HttpGet]
- public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate)
+ public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("sc_ICOMReportList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
string sql = "exec h_p_sc_ICOMReport '"+ sWhere + "','"+ HBeginDate + "','"+ HEndDate + "'";
ds = oCN.RunProcReturn(sql, "h_p_sc_ICOMReport");
@@ -1991,10 +2734,19 @@
#region 娴佽浆鍗℃湭鍏ュ簱鎶ヨ〃
[Route("MaterOutEntryReport/Sc_ProcExchangeNoInReport")]
[HttpGet]
- public object Sc_ProcExchangeNoInReport(string sWhere, string HBeginDate, string HEndDate)
+ public object Sc_ProcExchangeNoInReport(string sWhere, string HBeginDate, string HEndDate, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchangeNoInReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql = "exec h_p_Sc_ProcExchangeNoInReport '" + sWhere + "','" + HBeginDate + "','" + HEndDate + "'";
ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcExchangeNoInReport");
@@ -2032,10 +2784,19 @@
#region 鐢熶骇鍏ュ簱鎶ヨ〃
[Route("MaterOutEntryReport/sc_ICOMRKReport")]
[HttpGet]
- public object sc_ICOMRKReport(string sWhere)
+ public object sc_ICOMRKReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("sc_ICOMRKReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql = "select * from h_v_sc_ICOMRKReport where 1=1 " + sWhere + " order by 鏃ユ湡 ";
ds = oCN.RunProcReturn(sql, "h_v_sc_ICOMRKReport");
@@ -2078,10 +2839,19 @@
/// </summary>
[Route("Sc_BadReasonReport/list")]
[HttpGet]
- public object list(string sWhere, string user)
+ public object list(string sWhere, string user,string HGroupID)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_BadReasonReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
List<object> columnNameList = new List<object>();
if (sWhere == null || sWhere.Equals(""))
@@ -2093,7 +2863,7 @@
}
else
{
- ds = oCN.RunProcReturn("exec h_p_Sc_BadReasonReport '" + sWhere + "'", "h_p_Sc_BadReasonReport");
+ ds = oCN.RunProcReturn("exec h_p_Sc_BadReasonReport '" + sWhere + "','" + HGroupID + "'", "h_p_Sc_BadReasonReport");
}
//娣诲姞鍒楀悕
@@ -2176,11 +2946,20 @@
}
[Route("MaterOutEntryReport/SC_DayRkReport")]
[HttpGet]
- public object SC_DayRkReport(string sWhere,int num)
+ public object SC_DayRkReport(string sWhere,int num, string user)
{
try
{
- DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);
+ if (!DBUtility.ClsPub.Security_Log("SC_DayRkReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);
string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
$",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}','{DayRkReportList.HEmpName}','{DayRkReportList.sWheres}'";
@@ -2252,10 +3031,19 @@
}
[Route("MaterOutEntryReport/SemiFinishedProductsReportList")]
[HttpGet]
- public object SemiFinishedProductsReportList(string sWhere, int num)
+ public object SemiFinishedProductsReportList(string sWhere, int num, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("SemiFinishedProductsReportList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SemiFinishedProductsReport DayRkReportList = JsonConvert.DeserializeObject<SemiFinishedProductsReport>(sWhere);
string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
@@ -2393,10 +3181,18 @@
#region 宸ュ巶鏃ュ巻鏌ヨ
[Route("MaterOutEntryReport/Sc_ShopCalendar")]
[HttpGet]
- public object Sc_ShopCalendar(string sWhere)
+ public object Sc_ShopCalendar(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string sql1 = string.Format("select * from h_v_Gy_PlanShiftsList where 1=1 " + sWhere);
ds = oCN.RunProcReturn(sql1, "h_v_Gy_PlanShiftsList");
@@ -2510,6 +3306,695 @@
}
#endregion
+ #region 宸ュ巶鏃ュ巻淇濆瓨锛堟壒閲忥級
+ [Route("MaterOutEntryReport/Sc_ShopCalendarSaveList")]
+ [HttpPost]
+ public object Sc_ShopCalendarSaveList([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMainList(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ public class ClsHSourceList
+ {
+ public long HItemID { get; set; }
+ }
+ public class ClsHWorkHourList
+ {
+ public DateTime date { get; set; }
+ public string week { get; set; }
+ public double workHours { get; set; }
+ }
+ public json AddBillMainList(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//璧勬簮鍒楄〃
+ string msg3 = sArray[1].ToString();//鏁版嵁鍒楄〃
+ string user = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ List<ClsHSourceList> HSourceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsHSourceList>>(msg2);
+ List<ClsHWorkHourList> HWorkHourList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsHWorkHourList>>(msg3);
+ //閬嶅巻鏇存柊鏁版嵁
+ foreach (ClsHSourceList HSource in HSourceList)
+ {
+ long HSourceID = HSource.HItemID;
+ foreach (ClsHWorkHourList HWorkHour in HWorkHourList)
+ {
+ DateTime date = HWorkHour.date;
+ double workHours = HWorkHour.workHours;
+ ds = oCN.RunProcReturn("select * from Gy_PlanShifts where HDate='" + date + "' and HSourceID=" + HSourceID, "Gy_PlanShifts");
+ string sql = "";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ sql = $"update Gy_PlanShifts set HOverTimes='" + workHours + "' where HDate ='" + date + "' and HSourceID=" + HSourceID;
+ }
+ else
+ {
+ sql = $"insert into Gy_PlanShifts(HDate,HSourceID,HShiftsID,HOverTimes,HClassCount," +
+ "HRemark,HUseFlag)values" +
+ $"('{date}','{HSourceID}',0,'{workHours}','1'" +
+ $",'','鏈娴�')";
+ }
+ oCN.RunProc(sql);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ巶鏃ュ巻鎵规敼涓婄彮宸ユ椂
+ [Route("Gy_PlanShifts/BulkWorkTime")]
+ [HttpGet]
+ public object BulkWorkTime(string HSourceNumber1, string HSourceNumber2, string HBeginDate, string HEndDate,string HWorkTime)
+ {
+ try
+ {
+ oCN.BeginTran();
+
+ string sql = $"update a set HOverTimes = {HWorkTime} from Gy_PlanShifts a left join Gy_Source b on a.HSourceID = b.HItemID where b.HNumber between '{HSourceNumber1}' and '{HSourceNumber2}' and CONVERT(varchar(120),a.HDate,23) between CONVERT(varchar(120),'{HBeginDate}',23) and CONVERT(varchar(120),'{HEndDate}',23)";
+
+ //鎵ц鏇存柊涓婄彮宸ユ椂璇彞
+ oCN.RunProc(sql);
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵规敼鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ巶鏃ュ巻 鏂囦欢涓婁紶
+ [Route("Gy_PlanShifts/Gy_PlanShifts_Excel")]
+ [HttpPost]
+ public object Gy_PlanShifts_Excel()
+ {
+ try
+ {
+ //var WorkBookName = HttpContext.Current.Request["WorkBookName"];
+ //DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ tb2.Columns.Add("HSourceID", typeof(Int32));//鐢熶骇璧勬簮ID
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ //濡傛灉琛ㄦ牸绗琲琛岀殑绗竴鍒椾负绌猴紝鍒欏垽鏂负杩欎竴琛岀殑鏁版嵁涓虹┖锛岃烦鍑哄惊鐜苟涓斾笉鎶婃暟鎹啓鍏� tb2
+ if (ExcelDs.Tables[0].Rows[i][0].ToString() == "")
+ {
+ continue;
+ }
+ else
+ {
+ tb2.Rows.Add(row);
+ }
+ }
+
+
+ var error = "";
+
+ //鏌ヨ宸ヨ壓璺嚎娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("缁勭粐缂栫爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囩紪鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("缁勭粐"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囥�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐢熶骇璧勬簮浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮敓浜ц祫婧愪唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐢熶骇璧勬簮"))
+ error += "娌℃湁鎵惧埌銆愮敓浜ц祫婧愩�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏃ユ湡"))
+ error += "娌℃湁鎵惧埌銆愭棩鏈熴�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ユ椂"))
+ error += "娌℃湁鎵惧埌銆愬伐鏃躲�戠殑鏍囬,";
+
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string HORGNumber = "";
+ string HORGName = "";
+ string HSourceNumer = "";
+ string HSourceName = "";
+ string HDate = "";
+ string HOverTimes = "";
+
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐缂栫爜"].ToString());
+ HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐"].ToString());
+ HSourceNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐢熶骇璧勬簮浠ｇ爜"].ToString());
+ HSourceName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐢熶骇璧勬簮"].ToString());
+ HDate = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鏃ユ湡"].ToString());
+ HOverTimes = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸ユ椂"].ToString());
+
+ //妫�鏌ョ墿鏂�
+ int index = i + 1;
+
+ if (HORGNumber != "")
+ {
+
+
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+
+ //鏌ヨ鐢熶骇璧勬簮
+ ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + HSourceNumer + "' and HUSEORGID=" + HORGid + "", "Gy_Department");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,鐢熶骇璧勬簮:" + HSourceName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //鏃ユ湡
+ if (HDate == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,鏃ユ湡涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }else if(!Regex.IsMatch(HDate, @"^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,鏃ユ湡涓嶄负鈥測yyy-MM-dd鈥濇牸寮忥紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //宸ユ椂
+ if (HOverTimes == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,宸ユ椂涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //else if (!Regex.IsMatch(HWorkTime, @"/^\d+(\.\d+)?$/"))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + index + "琛�,宸ユ椂涓嶄负闈炶礋鏁版牸寮忥紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ巶鏃ュ巻 瀵煎叆(淇濆瓨)
+ [Route("Gy_PlanShifts/Gy_PlanShifts_btnSave")]
+ [HttpPost]
+ public object Gy_PlanShifts_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HSourceID = item["HSourceID"].ToString();//鐢熶骇璧勬簮ID
+ string HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HDate = item["鏃ユ湡"].ToString();
+ string HOverTimes = item["宸ユ椂"].ToString();
+
+ ds = oCN.RunProcReturn("select * from Gy_PlanShifts where HSourceID=" + HSourceID + " and convert(varchar(100),HDate,23)='" + HDate + "'", "Gy_PlanShifts");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ string sql = "insert into Gy_PlanShifts(HDate,HSourceID,HShiftsID,HOverTimes,HClassCount,HRemark,HUseFlag) " +
+ "values(" +
+ "'" + HDate + "'" +
+ "," + HSourceID + "" +
+ ",0" +
+ "," + HOverTimes + "" +
+ ",1" +
+ ",''" +
+ ",''" +
+ ")";
+
+ //涓昏〃
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_PlanShifts set HOverTimes = " + HOverTimes + " where HSourceID=" + HSourceID + " and convert(varchar(100),HDate,23)='" + HDate + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍒舵垚鐜囨槑缁嗘姤琛�
+ [Route("MaterOutEntryReport/Sc_ProductedRateReport")]
+ [HttpGet]
+ public object Sc_ProductedRateReport(string HBeginDate,string HEndDate,string sWhere,double HRate_BeyondICMOQty, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProductedRateReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Sc_ProductedRateReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'," + HRate_BeyondICMOQty;
+
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_ProductedRateReport");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 婊炵暀鏃堕棿鎶ヨ〃
+ [Route("MaterOutEntryReport/Sc_RetentionTimeReport")]
+ [HttpGet]
+ public object Sc_RetentionTimeReport(string HBeginDate,string HEndDate,string sWhere, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_RetentionTimeReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Sc_RetentionTimeReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_RetentionTimeReport");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞环鏍煎姣旀姤琛�
+ [Route("MaterOutEntryReport/Sc_CompareOrderToSelloutReport")]
+ [HttpGet]
+ public object Sc_CompareOrderToSelloutReport(string HBeginDate, string HEndDate, string sWhere, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_CompareOrderToSelloutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Sc_CompareOrderToSelloutReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_CompareOrderToSelloutReport");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞帓鍚嶆姤琛�
+ [Route("MaterOutEntryReport/Xs_SellOutMoneyRangeReport")]
+ [HttpGet]
+ public object Xs_SellOutMoneyRangeReport(string sWhere, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Xs_SellOutMoneyRangeReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> columnNameList = new List<object>();
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤";
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Xs_SellOutMoneyRangeReport '" + sWhere + "'", "h_p_Xs_SellOutMoneyRangeReport");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閿�鍞鍗曟潯鐮佸嚭鍏ュ簱璇︽儏
+ [Route("MaterOutEntryReport/Xs_SeOrderBarCodeInAndOutStockDetailReport")]
+ [HttpGet]
+ public object Xs_SeOrderBarCodeInAndOutStockDetailReport(string sWhere, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBarCodeInAndOutStockDetailReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from h_v_Xs_SeOrderBarCodeInAndOutStockDetailReport_Query where 1=1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Xs_SeOrderBarCodeInAndOutStockDetailReport_Query");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
}
--
Gitblit v1.9.1