From aa51348d3501aa3a9bbda287929f3c8a05825063 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 03 十二月 2025 18:14:31 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/POStockInBillController.cs | 160 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 143 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index c65a35e..87cdf36 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -3369,8 +3369,76 @@
}
+ #region [閫氳繃 婧愬崟鍗曞彿 杩涜 鏉ユ枡妫�楠宂
+ /// <summary>
+ /// 閫氳繃 婧愬崟鍗曞彿 杩涜 鏉ユ枡妫�楠�
+ /// </summary>
+ /// <param name="HBarCode">婧愬崟鍗曞彿</param>
+ /// <param name="HOrgID">缁勭粐ID</param>
+ /// <returns></returns>
+ [Route("Kf_QCStockInCheckBill_Fast/BarCode_Json_SourceBillNo")]
+ [HttpGet]
+ public object BarCode_Json_SourceBillNo(string HBarCode, Int64 HOrgID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet Dss;
+
+ // 鑾峰彇閲戣澏浜戜腑瀵瑰簲鐨勭粍缁�
+ Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+
+ // 鏍规嵁閲囪喘璁㈠崟鍙疯幏鍙� 鏀舵枡閫氱煡鍗� 鍜� 鐗╂枡淇℃伅
+ DataSet Dss2;
+ Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HBarCode + "'", "h_v_RECEIVEQuery");
+
+ if(Dss2 == null || Dss2.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string HPOStockInBillNo = Dss2.Tables[0].Rows[0]["FBILLNO"].ToString();
+
+ DataSet ds;
+ ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json_SourceBill where HSourceBillNo ='" + HPOStockInBillNo.ToString() + "'", "h_v_QCStockInCheckBill_Json");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
[Route("Kf_QCStockInCheckBill_Fast/BarCode_Json")]
@@ -5013,7 +5081,16 @@
{
try
{
- string _msg = msg["msg"].ToString();
+ string HMaker =""; //鍒跺崟浜�
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string _msg = sArray[0].ToString();
+ if(sArray.Length>1)
+ {
+ HMaker = sArray[1].ToString();
+ }
+
_msg = _msg.Replace("\\", "");
_msg = _msg.Replace("\n", "");
List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
@@ -5174,7 +5251,8 @@
["IsVerifyBaseDataField"] = "false",
["Model"] = model
};
- var loginRet = InvokeHelper.Login();
+ //鐧诲綍
+ var loginRet = InvokeHelper.LoginUser(HMaker);
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
{
@@ -5220,7 +5298,54 @@
LogService.Write("鏀舵枡閫氱煡鍗曞鏍告棤鏁版嵁锛�" + sql);
}
}
- else //澶忓疂 锛屾洿鏂癳rp淇℃伅
+ else if(FCusName.Contains("澶忓疂"))
+ {
+ JObject jsonRoot = new JObject();
+ jsonRoot.Add("Creator", "");
+ jsonRoot.Add("NeedUpDateFields", new JArray());
+ jsonRoot.Add("NeedReturnFields", new JArray());
+ jsonRoot.Add("IsDeleteEntry", "false"); //娉ㄦ剰IsDeleteEntry鍙傛暟锛屽涓篢rue锛屽垯鍘熷垎褰曡鐨凢EntryId鏈湪鍒嗗綍json鍑虹幇鐨勮锛屽皢浼氳鍒犻櫎 锛堝鏃犻渶鍒犻櫎鍒嗗綍琛岋紝鍙敼涓篺asle锛�
+ jsonRoot.Add("SubSystemId", "");
+ jsonRoot.Add("IsVerifyBaseDataField", "");
+
+ JObject jsonModel = new JObject();
+ jsonModel.Add("FID", FID);
+ JArray Entry = new JArray();
+ foreach (var item in list)
+ {
+ if (item.HSQty == 0)
+ continue;
+ JObject jsonFPOOrderEntry = new JObject();
+ jsonFPOOrderEntry.Add("FEntryID", item.FEntryID);
+ jsonFPOOrderEntry.Add("FActReceiveQty ", item.HSQty); ;
+ Entry.Add(jsonFPOOrderEntry);
+ }
+ jsonModel.Add("FDetailEntity", Entry);
+ jsonRoot.Add("Model", jsonModel);
+ //鐧诲綍
+ var loginRet = InvokeHelper.LoginUser(HMaker);
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
+ //LogService.Write(result);
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曚慨鏀瑰け璐sonRoot:" + jsonRoot.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟洿鏂板け璐�" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else //鏇存柊erp淇℃伅
{
JObject jsonRoot = new JObject();
jsonRoot.Add("Creator", "");
@@ -5244,7 +5369,8 @@
}
jsonModel.Add("FDetailEntity", Entry);
jsonRoot.Add("Model", jsonModel);
- var loginRet = InvokeHelper.Login();
+ //鐧诲綍
+ var loginRet = InvokeHelper.LoginUser(HMaker);
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess <= 0)
{
@@ -5318,21 +5444,21 @@
}
[Route("POStockInBillList/AuditPOInStockBillPost_TianKang")]
- [HttpPost]
- public object AuditPOInStockBill_TianKang([FromBody] JObject msg)
+ [HttpGet]
+ public object AuditPOInStockBill_TianKang(long FID,string user)
{
try
{
- string _msg = msg["msg"].ToString();
- _msg = _msg.Replace("\\", "");
- _msg = _msg.Replace("\n", "");
- List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
- DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
- var hinterID = list[0].HInterID;
- var FID = list[0].FID;
- string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);//瀹㈡埛鍚嶇О
- var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
- string sql = string.Empty;
+ //string _msg = msg["msg"].ToString();
+ //_msg = _msg.Replace("\\", "");
+ //_msg = _msg.Replace("\n", "");
+ //List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
+ //DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
+ //var hinterID = list[0].HInterID;
+ //var FID = list[0].FID;
+ //string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);//瀹㈡埛鍚嶇О
+ //var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+ //string sql = string.Empty;
var json = new
{
@@ -5340,7 +5466,7 @@
};
//LogService.Write(json);
//鐧诲綍
- var loginRet = InvokeHelper.Login();
+ var loginRet = InvokeHelper.LoginUser(user);
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess <= 0)
{
--
Gitblit v1.9.1