From 02149a8ae296cf7a4bb88ea4f6579a4481e84c06 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 15 四月 2026 17:24:34 +0800
Subject: [PATCH] 新建设备运行切片 API
---
WebAPI/Controllers/生产管理/设备状态分步/Sc_HEquipStateDistributionController.cs | 123 ++++++++++++++++++++
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 139 ++++++++++++++++++++++
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 55 +++++++++
WebAPI/Models/HSouceOrderList.cs | 5
WebAPI/WebAPI.csproj.user | 4
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user | 8
9 files changed, 325 insertions(+), 9 deletions(-)
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index c77be62..17acf7f 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 58a0ce2..65bc671 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index debd523..29103e7 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index d423f0a..e8a110c 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -535,9 +535,13 @@
break;
case "1103": //鏀舵枡閫氱煡鍗�
//寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+ // ds = oCN.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList_Source where 鍙敓鎴愭潯鐮佹暟閲� > 0 and hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockBillList_Source");
+
+
//鍐欏叆淇℃伅
- ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ //ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ ListRows.Add(HSourceOrderList2(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
case "1601": //濮斿璁㈠崟
//寰楀埌淇℃伅
@@ -791,6 +795,135 @@
ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
}
if(HSourceBillType == "閿�鍞嚭搴撳崟")
+ {
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ //ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ //ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ //ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ }
+ }
+ return ordrlist;
+ }
+
+ public object HSourceOrderList2(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType, string HSourceBillType)
+ {
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ ordrlist.HQty = dt.Rows[i]["鍙敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMinQty = dt.Rows[i]["鍙敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMainID = dt.Rows[i]["hmainid"].ToString();
+ ordrlist.HSubID = dt.Rows[i]["hsubid"].ToString();
+ ordrlist.HBillNo = dt.Rows[i]["鍗曟嵁鍙�"].ToString();
+ ordrlist.HBillType = dt.Rows[i]["HBillType"].ToString();
+ ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
+ ordrlist.HShowDate = DateTime.Now.ToString();
+ ordrlist.HDeptID = dt.Rows[i]["HDeptID"].ToString();
+ ordrlist.HDeptNumber = dt.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString();
+ ordrlist.HDeptName = dt.Rows[i]["閮ㄩ棬"].ToString();
+ ordrlist.HMaterID = dt.Rows[i]["HMaterID"].ToString();
+ ordrlist.HMaterNumber = dt.Rows[i]["鐗╂枡浠ｇ爜"].ToString();
+ ordrlist.HMaterName = dt.Rows[i]["鐗╂枡鍚嶇О"].ToString();
+ ordrlist.HMaterModel = dt.Rows[i]["瑙勬牸鍨嬪彿"].ToString();
+ ordrlist.HBatchNo = dt.Rows[i]["鎵瑰彿"].ToString();
+ ordrlist.HUnitID = dt.Rows[i]["HUnitID"].ToString();
+ // ordrlist.HUnitNumber = dt.Rows[i]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ ordrlist.HUnitName = dt.Rows[i]["璁￠噺鍗曚綅"].ToString();
+ // ordrlist.HRemark = dt.Rows[i]["澶囨敞"].ToString();
+ ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ ordrlist.HProduceDate = DBUtility.ClsPub.isDate(dt.Rows[i]["鐢熶骇鏃ユ湡"]);
+ ordrlist.HExpiryDate = DBUtility.ClsPub.isDate(dt.Rows[i]["鏈夋晥鏈熻嚦"]);
+ //ordrlist.HISKFPERIOD = int.Parse(dt.Rows[i]["HISKFPERIOD"].ToString());
+ //ordrlist.HISKFPERIOD = DBUtility.ClsPub.isInt(dt.Rows[i]["HISKFPERIOD"]);
+ //ordrlist.HEXPUNIT = dt.Rows[i]["HEXPUNIT"].ToString(); //鏈夋晥鏈熷崟浣�(鏃ャ�佹湀銆佸勾)
+ //ordrlist.HEXPPERIOD = double.Parse(dt.Rows[i]["HEXPPERIOD"].ToString()); //鏈夋晥鏈熷��
+
+
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ ordrlist.HAuxPropID = dt.Rows[i]["HAuxPropID"].ToString();
+ ordrlist.HAuxPropNumber = dt.Rows[i]["杈呭姪灞炴�т唬鐮�"].ToString();
+ ordrlist.HAuxPropName = dt.Rows[i]["杈呭姪灞炴��"].ToString();
+ ordrlist.HSourceBillNo = dt.Rows[i]["婧愬崟鍗曞彿"].ToString();
+ ordrlist.HSeOrderBillNo = dt.Rows[i]["閿�鍞鍗曞彿"].ToString();
+ ordrlist.HSeOrderSEQ = int.Parse(dt.Rows[i]["閿�鍞鍗曡鍙�"].ToString());
+ ordrlist.HReInspectionFlag = string.IsNullOrWhiteSpace(dt.Rows[i]["澶嶆鏍囪"].ToString()) ? false : true;
+ ordrlist.HInspectionCycle = int.Parse(dt.Rows[i]["澶嶆鍛ㄦ湡"].ToString());
+ ordrlist.HReInspectionDate = dt.Rows[i]["妫�楠屾棩鏈�"].ToString();
+ ordrlist.HSupID = dt.Rows[i]["HSupID"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HPOOrderBillMTO = dt.Rows[i]["閲囪喘璺熻釜鍙�"].ToString();
+ if (oSystemParameter.omodel.WMS_CampanyName.Contains("鍥涚淮灏�"))
+ {
+
+ }
+ else if (oSystemParameter.omodel.WMS_CampanyName.Contains("閿﹂殕")){
+ ordrlist.JLHCusOrderBillNo = dt.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString();
+ ordrlist.JLHProdModel = dt.Rows[i]["浜у搧鍨嬪彿"].ToString();
+ }
+ }
+
+ if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ }
+ else if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�")
+ {
+ ordrlist.HMinQty = "1";
+ }
+ else
+ {
+ // ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
+ ordrlist.HMaker = ClsPub.CurUserName;
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�" || HSourceBillType == "閲囪喘璁㈠崟" || HSourceBillType == "濮斿璁㈠崟" || HSourceBillType == "閲囪喘鍏ュ簱鍗�")
+ {
+ ordrlist.HSupID = dt.Rows[i]["hsupid"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].ToString();
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ if (dt.Rows[i]["鏄惁璧犲搧"].ToString() == "鏄�")
+ {
+ ordrlist.HGiveAwayFlag = 1;
+ }
+ else
+ {
+ ordrlist.HGiveAwayFlag = 0;
+ }
+ ordrlist.HSeOrderBillNo = dt.Rows[i]["閿�鍞鍗曞彿"].ToString();
+ ordrlist.HSeOrderSEQ = int.Parse(dt.Rows[i]["閿�鍞鍗曡鍙�"].ToString());
+ }
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�" || HSourceBillType == "閲囪喘璁㈠崟")
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "娴疯瘹") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ ordrlist.HSourceBillSEQ = dt.Rows[i]["HSEQ"].ToString();
+ ordrlist.HFactory = dt.Rows[i]["瀹㈡埛缂栧彿"].ToString();
+ ordrlist.HCoilNO = dt.Rows[i]["娆惧彿"].ToString();
+ ordrlist.HFurnaceNO = dt.Rows[i]["鍒嗙粍"].ToString();
+ }
+ }
+ }
+ if (HSourceBillType == "閫�璐ч�氱煡鍗�")
+ {
+ ordrlist.HCusID = dt.Rows[i]["HCusID"].ToString();
+ ordrlist.HCusNumber = dt.Rows[i]["瀹㈡埛浠ｇ爜"].ToString();
+ ordrlist.HCusName = dt.Rows[i]["瀹㈡埛"].ToString();
+ }
+ if (HSourceBillType == "鍏朵粬鍏ュ簱鍗�" || HSourceBillType == "棰嗘枡鍑哄簱鍗�")
+ {
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ }
+ if (HSourceBillType == "閿�鍞嚭搴撳崟")
{
ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
@@ -2813,6 +2946,8 @@
}
#endregion
+
+
#region[鏉＄爜鐢熸垚鏂规硶_閿﹂殕]
private object SaveBarCode_JinLong(string msg2, string HSelectBarCodeType, string CampanyName, string HSourceBillTypeName)
{
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 3e43e2c..1a8dee0 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -2453,5 +2453,60 @@
}
}
#endregion
+
+ #region 璐ㄩ噺妯″潡 璐ㄩ噺姣忔棩杩愯鐘舵�佸垎鏋�
+ [Route("QC_CustomerAppealReport/QC_DailyRunStateReportList")]
+ [HttpGet]
+ public object QC_DailyRunStateReportList(string sWhere, string user)
+ {
+ try
+ {
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_QC_DailyRunStateReport '" + HBeginDate + "','" + HEndDate + "'", "h_p_QC_DailyRunStateReport");
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ //娣诲姞鍒楀悕
+ 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;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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;
+ }
+ }
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
index 9e1eec6..120b776 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
@@ -23,6 +23,7 @@
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
#region 璁惧鍒嗗竷 璁惧缁戝畾鐨勭敓浜ц祫婧愪笂姝ｅ湪鐢熶骇鐨勫伐鍗�
@@ -175,5 +176,127 @@
}
}
#endregion
+
+ #region 璁惧杩愯鍒囩墖锛岃幏鍙栭儴闂�-璁惧 鏍戠姸鍥�
+ private class HEquipTreeList_DAQ_Node
+ {
+ public int id { get; set; }
+ public string title { get; set; }
+ public List<HEquipTreeList_DAQ_Node> children { get; set; }
+ }
+
+
+ [Route("DAQ_EquipRunningSlice/GetHEquipTreeList_DAQ")]
+ [HttpGet]
+ public object Sc_HEquipStateDistribution_Souce(string sWhere)
+ {
+ try
+ {
+ List<HEquipTreeList_DAQ_Node> treeArr = new List<HEquipTreeList_DAQ_Node>();
+ // 璁板綍閮ㄩ棬鏄惁宸茬粡鍔犲叆treeArr(涓嶅彲閲嶅鍔犲叆)
+ HashSet<String> HDeptSet = new HashSet<String>();
+
+ ds = oCN.RunProcReturn($@"select hmainid HEquipID, 璁惧鍚嶇О HEquipName, HDeptID HDeptID, 浣跨敤閮ㄩ棬 HDeptName from h_v_Gy_EquipFileMainList
+ {sWhere}
+ order by HEquipName asc", "h_v_Gy_EquipFileMainList");
+
+ foreach(DataRow row in ds.Tables[0].Rows)
+ {
+ int HDeptID = int.Parse(row["HDeptID"].ToString());
+ string HDeptName = row["HDeptName"] as string;
+ int HEquipID = int.Parse(row["HEquipID"].ToString());
+ string HEquipName = row["HEquipName"] as string;
+
+ if (!HDeptSet.Contains(row["HDeptID"].ToString()))
+ {
+ // 娌℃湁閮ㄩ棬瀵瑰簲鐨勪竴绾ц妭鐐癸紝鍒欐坊鍔犱竴绾ц妭鐐�
+ treeArr.Add(new HEquipTreeList_DAQ_Node
+ {
+ id = int.Parse(row["HDeptID"].ToString()),
+ title = row["HDeptName"].ToString(),
+ children = new List<HEquipTreeList_DAQ_Node>()
+ });
+
+ // 閮ㄩ棬ID娣诲姞鍒癝et锛岀‘淇濆敮涓�鎬�
+ HDeptSet.Add(row["HDeptID"].ToString());
+ }
+
+ // 閮ㄩ棬瀵瑰嵃鐨勪竴绾ц妭鐐瑰凡缁忚缃ソ锛岃缃簩绾ц妭鐐�
+ HEquipTreeList_DAQ_Node Node = treeArr.First(item => item.id == HDeptID);
+ Node.children.Add(new HEquipTreeList_DAQ_Node
+ {
+ id = HEquipID,
+ title = HEquipName,
+ children = new List<HEquipTreeList_DAQ_Node>()
+ });
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = JArray.FromObject(treeArr);
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧杩愯鍒囩墖 杩斿洖璁惧鐘舵�� 鍥捐〃鏁版嵁
+ [Route("DAQ_EquipRunningSlice/GetHEquipStatusReportList_DAQ")]
+ [HttpGet]
+ public object GetHEquipStatusReportList_DAQ(string HEquipID, string HDeptID, string HBeginDate, string HEndDate, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql = "select * from h_v_Sb_EquipRunningStatusReport where 1 = 1";
+ if(!string.IsNullOrWhiteSpace(HEquipID) && HEquipID != "0")
+ {
+ sql += $" and HEquipID = {HEquipID}";
+ }
+ if(!string.IsNullOrWhiteSpace(HDeptID) && HDeptID != "0")
+ {
+ sql += $" and HDeptID = {HDeptID}";
+ }
+ if(!string.IsNullOrWhiteSpace(HBeginDate) && !string.IsNullOrWhiteSpace(HEndDate))
+ {
+ sql += $"and (鎵�灞炴棩鏈� between CONVERT(DATETIME, '{HBeginDate} 00:00:00', 120) AND CONVERT(DATETIME, '{HEndDate} 23:59:59', 120))";
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRunningStatusReport");
+
+ //娣诲姞鍒楀悕
+ 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 ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/HSouceOrderList.cs b/WebAPI/Models/HSouceOrderList.cs
index 3eb84af..68ca2ab 100644
--- a/WebAPI/Models/HSouceOrderList.cs
+++ b/WebAPI/Models/HSouceOrderList.cs
@@ -101,5 +101,10 @@
public string JMHSupName { get; set; } // "閲戦┈渚涘簲鍟�";
public string HTH { get; set; } // "鍚堝悓鍙�";
public double HZQty { get; set; } // "鎬荤鏁�";
+
+ // 閿﹂殕
+ public string JLHCusOrderBillNo { get; set; } // 瀹㈡埛璁㈠崟鍙�
+
+ public string JLHProdModel { get; set; } // 浜у搧鍨嬪彿
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
index d25d00e..9d07f86 100644
--- a/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/CHZFolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-04-10T04:36:37.6936108Z;False|2026-04-10T12:35:40.0121010+08:00;True|2026-04-09T16:54:43.8820523+08:00;True|2026-04-09T16:45:33.9913393+08:00;True|2026-04-09T16:05:37.9135976+08:00;True|2026-04-09T15:59:59.0415690+08:00;True|2026-04-09T14:40:06.6317662+08:00;True|2026-04-09T14:33:57.7268880+08:00;True|2026-04-09T14:29:06.9748272+08:00;True|2026-04-09T14:15:35.2357549+08:00;True|2026-04-09T13:55:15.7398283+08:00;True|2026-04-09T10:49:39.1474349+08:00;False|2026-04-09T10:48:56.4483129+08:00;True|2026-04-08T15:52:56.0654175+08:00;True|2026-04-08T15:51:48.5362330+08:00;True|2026-04-08T15:38:55.9430240+08:00;True|2026-04-08T14:28:05.8170952+08:00;True|2026-04-08T10:04:26.1290532+08:00;True|2026-04-08T09:54:42.7091796+08:00;True|2026-04-08T09:47:39.4265409+08:00;True|2026-04-08T09:31:33.9940810+08:00;True|2026-04-08T09:25:48.8335042+08:00;True|2026-04-08T09:18:49.2340416+08:00;True|2026-04-08T09:05:38.1946058+08:00;True|2026-04-08T08:51:42.9648664+08:00;False|2026-04-08T08:50:29.4049907+08:00;True|2026-04-07T16:38:07.0366622+08:00;True|2026-04-07T16:30:02.5849908+08:00;True|2026-04-07T10:34:01.7729330+08:00;True|2026-04-07T09:48:28.6594815+08:00;True|2026-04-07T08:27:08.5467426+08:00;</History>
+ <History>True|2026-04-15T07:25:13.5585076Z;True|2026-04-15T15:18:40.0113998+08:00;True|2026-04-15T13:40:25.2393656+08:00;False|2026-04-15T13:39:38.6236889+08:00;True|2026-04-14T14:31:30.6734754+08:00;False|2026-04-14T14:30:41.4516757+08:00;True|2026-04-13T16:44:08.4642937+08:00;True|2026-04-13T16:36:02.3077110+08:00;True|2026-04-13T14:59:21.0103174+08:00;True|2026-04-13T14:39:45.1257225+08:00;True|2026-04-13T14:33:54.7926295+08:00;True|2026-04-13T14:28:29.8919092+08:00;True|2026-04-13T14:23:44.7319904+08:00;True|2026-04-13T14:19:18.5894161+08:00;True|2026-04-13T14:13:07.6590290+08:00;True|2026-04-13T14:08:38.6545470+08:00;True|2026-04-13T13:42:48.7331271+08:00;True|2026-04-13T13:28:28.6092259+08:00;True|2026-04-13T13:22:20.9710518+08:00;False|2026-04-13T13:21:10.4412531+08:00;True|2026-04-10T12:36:37.6936108+08:00;False|2026-04-10T12:35:40.0121010+08:00;True|2026-04-09T16:54:43.8820523+08:00;True|2026-04-09T16:45:33.9913393+08:00;True|2026-04-09T16:05:37.9135976+08:00;True|2026-04-09T15:59:59.0415690+08:00;True|2026-04-09T14:40:06.6317662+08:00;True|2026-04-09T14:33:57.7268880+08:00;True|2026-04-09T14:29:06.9748272+08:00;True|2026-04-09T14:15:35.2357549+08:00;True|2026-04-09T13:55:15.7398283+08:00;True|2026-04-09T10:49:39.1474349+08:00;False|2026-04-09T10:48:56.4483129+08:00;True|2026-04-08T15:52:56.0654175+08:00;True|2026-04-08T15:51:48.5362330+08:00;True|2026-04-08T15:38:55.9430240+08:00;True|2026-04-08T14:28:05.8170952+08:00;True|2026-04-08T10:04:26.1290532+08:00;True|2026-04-08T09:54:42.7091796+08:00;True|2026-04-08T09:47:39.4265409+08:00;True|2026-04-08T09:31:33.9940810+08:00;True|2026-04-08T09:25:48.8335042+08:00;True|2026-04-08T09:18:49.2340416+08:00;True|2026-04-08T09:05:38.1946058+08:00;True|2026-04-08T08:51:42.9648664+08:00;False|2026-04-08T08:50:29.4049907+08:00;True|2026-04-07T16:38:07.0366622+08:00;True|2026-04-07T16:30:02.5849908+08:00;True|2026-04-07T10:34:01.7729330+08:00;True|2026-04-07T09:48:28.6594815+08:00;True|2026-04-07T08:27:08.5467426+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -339,13 +339,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/10/2026 12:36:13</publishTime>
+ <publishTime>04/15/2026 15:24:58</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/10/2026 12:36:13</publishTime>
+ <publishTime>04/15/2026 15:24:58</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>04/10/2026 12:36:29</publishTime>
+ <publishTime>04/15/2026 15:25:10</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index b2486e8..f1f21a8 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -14,9 +14,7 @@
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\CHZFolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
--
Gitblit v1.9.1