From c2a9a460e38c7c196fe98a94e29e6330eac3626f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 03 三月 2023 14:30:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_PckSplitBillController.cs | 206 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 196 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs
index a123d40..9cdd59d 100644
--- a/WebAPI/Controllers/Sc_PckSplitBillController.cs
+++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -374,13 +374,13 @@
{
try
{
- string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where HBillType='1204' " + sWhere);
+ string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where 1=1 " + sWhere);
DataSet ds=oCn.RunProcReturn(sql1, "h_v_Kf_ICStockBillList");
if (ds.Tables[0].Rows.Count == 0 || ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鏆傛棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -388,7 +388,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏆傛棤鏁版嵁";
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -405,20 +405,82 @@
}
#endregion
- #region 浜х嚎鍏抽敭浠剁粦瀹歋N鍙锋煡璇�
- [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+ #region 浜х嚎鍏抽敭浠剁粦瀹�
+ /// <summary>
+ /// SN鍙锋煡璇�
+ /// </summary>
+ /// <param name="HBarCode">SN鍙�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Get_PHPCruxSNBillList")]
[HttpGet]
- public Object Get_PHPCruxBillList(string HBarCode)
+ public Object Get_PHPCruxSNBillList(int HinterID, string HBarCode,int HProcID,string HBillNo)
{
try
{
- string sql1 = string.Format(@"select a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,a.HQtyMust,0 HQty,'"+ HBarCode + "' as HCPM from Sc_PPBomBillSub a left join Gy_Material m on a.HMaterID=m.HItemID where HICMOEntryID=(select HSourceEntryID from Gy_BarCodeBill where HBarCode='"+HBarCode+"')");
- DataSet ds = oCn.RunProcReturn(sql1, "Sc_PPBomBillSub");
+ string sql1 = string.Format($"exec h_p_Sc_PHPCruxSNBillTOTemp '"+HBarCode+"',"+HinterID+","+HProcID+",'"+ HBillNo+"'");
+ DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxSNBillTOTemp");
if (ds.Tables[0].Rows.Count == 0 || ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["sel"]) ==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];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍏抽敭鐮佹煡璇�
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+ [HttpGet]
+ public Object Get_PHPCruxBillList(int HinterID,string HPCrux,string HBillNo)
+ {
+ try
+ {
+ string sql1 = string.Format($"exec h_p_Sc_PHPCruxBillTOTemp '" +HPCrux+"',"+ HinterID+",'"+ HBillNo+"'");
+ DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxBillTOTemp");
+ if (ds.Tables[0].Rows.Count == 0 || ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏉″舰鐮佷俊鎭紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ objJsonResult.code = "2";
+ objJsonResult.count = 2;
+ objJsonResult.Message = "閿欒锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -427,7 +489,7 @@
//鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹�
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏆傛棤鏁版嵁";
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -442,6 +504,130 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 鎵爜缂撳瓨鍒犻櫎
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Delete_PHPCruxBillListByME")]
+ [HttpGet]
+ public Object Delete_PHPCruxBillListByME(int HInterID,int HMaterID,string HBarCode)
+ {
+ try
+ {
+ oCn.BeginTran();
+ string sql = string.Format(@"delete Sc_AssemblyBill_BindBarCodeTemp where HInterID="+ HInterID+" and HMaterID="+ HMaterID+ " and HBarCode='" + HBarCode+"'");
+ oCn.RunProc(sql);
+ //鍒犻櫎鎴愬姛
+ string sql1= string.Format(@"select a.HEntryID,a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,1 HQty,HBarCode HPJM
+ from Sc_AssemblyBill_BindBarCodeTemp a left join Gy_Material m on a.HMaterID=m.HItemID
+ where HInterID=" + HInterID);
+ DataSet ds=oCn.RunProcReturn(sql1, "Sc_AssemblyBill_BindBarCodeTemp");
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 缁勮鍗曟彁浜�
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Add_PHPCruxBillList")]
+ [HttpPost]
+ public Object Add_PHPCruxBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//鍩烘湰璧勬枡
+ string msg3 = sArray[1].ToString();//閰嶄欢鍒楄〃
+ string msg4 = sArray[2].ToString();//鏉＄爜鍒楄〃
+ string msg5 = sArray[3].ToString();//鐧诲綍浜�
+ ListModels oListModels = new ListModels();
+ long HinterID;
+ string HBillNo = "";
+
+ try
+ {
+ DLL.ClsSc_PHPCruxBillBill oBill = new DLL.ClsSc_PHPCruxBillBill();
+ List<Models.ClsSc_AssemblyBillMain> lsmain = new List<Models.ClsSc_AssemblyBillMain>();//鍩烘湰璧勬枡
+ List<Models.ClsSc_AssemblyBillMain> lspjItme = new List<Models.ClsSc_AssemblyBillMain>();//閰嶄欢鍒楄〃
+ List<Models.ClsSc_AssemblyBillSub> lstmItme = new List<Models.ClsSc_AssemblyBillSub>();//鎵爜鍒楄〃
+ //鍩烘湰璧勬枡_json鏍煎紡杞崲
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Sc_AssemblyBillMain(msg2);
+
+ HinterID = lsmain[0].HInterID;//涓籌D
+ HBillNo = lsmain[0].HBillNo;//鍗曟嵁鍙�
+
+
+ //浜嬪姟寮�濮�
+ oCn.BeginTran();
+ //鏍规嵁interID鍦ㄦ簮鍗曚复鏃惰〃涓煡鎵炬暟鎹�
+ DataSet ds1 = oCn.RunProcReturn("select top 1 * from Sc_AssemblyBill_BindSourceTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindSourceTemp");
+ //淇濆瓨鐢熶骇缁勮鍗曚富琛�
+ string sql = "Insert Into Sc_AssemblyBillMain " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate," +
+ "HBillNo,HBillStatus,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceBillNo" +
+ ",HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus" +
+ ") " +
+ " values('" + DateTime.Now.Year + "','" + DateTime.Now.Month + "',3727,3727," + HinterID + ",'" + DateTime.Now+
+ "','" + HBillNo + "',1,'"+msg5+"',getdate()" +
+ ",0,'" + lsmain[0].HBarCode + "'" +
+ "," + ds1.Tables[0].Rows[0]["HSourceInterID"].ToString() + ",'" + ds1.Tables[0].Rows[0]["HSourceBillNo"].ToString() + "','" + lsmain[0].HBarCode + "',0,0,'鐢熶骇涓�'" +
+ ") ";
+ oCn.RunProc(sql);
+
+ //鏍规嵁interID鍦ㄦ壂鐮佷复鏃惰〃涓煡鎵炬暟鎹�
+ DataSet ds2 = oCn.RunProcReturn("select * from Sc_AssemblyBill_BindBarCodeTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindBarCodeTemp");
+ for (int i = 0; i < ds2.Tables[0].Rows.Count; i++)
+ {
+ string sq2 = "Insert Into Sc_AssemblyBillSub " +
+ "(HInterID,HBillNo_bak,HEntryID," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HSourceID,HEquipID,HUnitID,HQty,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber" +
+ ") " +
+ " values(" + HinterID + ",'" + HBillNo + "'," + i +
+ "," + ds2.Tables[0].Rows[i]["HSourceInterID"].ToString() + "," + ds2.Tables[0].Rows[i]["HSourceEntryID"].ToString() + ",'" + ds2.Tables[0].Rows[i]["HSourceBillNo"].ToString() + "'" +
+ ",''," + ds2.Tables[0].Rows[i]["HMaterID"].ToString() + ",'"+ lsmain[0].HSCZYID + "',0,0,1," + lsmain[0].HGroupID + "," + lsmain[0].HKeeperID + ",getdate(),'" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + lsmain[0].HBarCode + "'" +
+ ") ";
+ oCn.RunProc(sq2);
+ }
+ 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 = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
+
}
}
--
Gitblit v1.9.1