From cac7dffbf8189bd6f316339c032cbb9519eb7c6f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 22 三月 2023 13:24:35 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/LMESController.cs | 42 ++++++++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/ReportController.cs | 6 ++++--
2 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 5d953f3..4c7a8ea 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -472,6 +472,48 @@
}
/// <summary>
+ /// 宸ュ簭娴佽浆鍗＄殑鏈亾宸ュ簭
+ /// </summary>
+ /// <param name="sBillBarCode"></param>
+ /// <returns></returns>
+ [Route("LEMS/TxtHBarCode_KeyDown_Last")]
+ [HttpGet]
+ public object TxtHBarCode_KeyDown_Last(string sBillBarCode)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sBillBarCode == null || sBillBarCode.Equals(""))
+ {
+ return CustomError("鏈緭鍏ユ潯褰㈢爜锛�");
+ }
+ else
+ {
+ //鎷嗗垎鏉″舰鐮�
+ string[] NewBarCode;
+ if (sBillBarCode.CompareTo("#") > 0)
+ {
+ NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
+ sBillBarCode = NewBarCode[0];
+ }
+ string sBillNo = sBillBarCode;
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 鏈亾宸ュ簭='鏄�' ", "h_v_Sc_ProcessExchangeBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ return CustomError("涓嶅瓨鍦ㄦ娴佽浆鍗″彿锛�");
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+ /// <summary>
/// 娴佹按鍙峰洖杞︽柟娉�(杩涚珯鎺ユ敹鍗曘�佸嚭绔欐眹鎶ュ崟)
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
diff --git a/WebAPI/Controllers/ReportController.cs b/WebAPI/Controllers/ReportController.cs
index 1c27082..326f340 100644
--- a/WebAPI/Controllers/ReportController.cs
+++ b/WebAPI/Controllers/ReportController.cs
@@ -273,7 +273,7 @@
FentityModel.Add("FMoEntrySeq", dr1["FMOENTRYSEQ"].ToString());//鐢熶骇璁㈠崟琛屽彿
FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//鐢熶骇璁㈠崟鍐呯爜
FentityModel.Add("FFinishQty", item["鎺ユ敹鏁伴噺"].ToString());//瀹屾垚鏁伴噺1
- FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1FFailQty
+ //FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1FFailQty
FentityModel.Add("FFailQty", item["涓嶈壇鏁伴噺"].ToString());//涓嶅悎鏍兼暟閲�
FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// 鍏ュ簱缁勭粐
FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // 浠撳簱
@@ -281,10 +281,12 @@
FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());//
FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //璐т富绫诲瀷锛欶OwnerTypeId(蹇呭～椤�)
FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //璐т富锛欶OwnerId(蹇呭～椤�)
- FentityModel.Add("FBomId", new JObject() { ["F number"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
+ FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 鎴愭湰鏉冮噸
FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
+ FentityModel.Add("FCHECKPRODUCT", dr1["HCHECKPRODUCT"].ToString() == "1" ? true : false);// 浜у搧妫�楠�
FentityModel.Add("FMOMAINENTRYID", dr1["FMOENTRYID"].ToString());//
+ //FentityModel.Add("FSRCENTRYSEQ", dr1["HSEQ"].ToString());//婧愬崟琛屽彿
FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
//FentityModel.Add("F_RCZU_LZKH", dr1["宸ュ簭娴佽浆鍗″彿"].ToString());// 宸ュ簭娴佽浆鍗�
JArray Fentity2 = new JArray();
--
Gitblit v1.9.1