From 1f49f98a07ae1c31a1967c5c36b382d6c855becd Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 26 七月 2022 09:59:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 608 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 384 insertions(+), 224 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index d1a3ca7..72ad2b7 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -26,22 +26,23 @@
try
{
ds = StockCheckItemList(sWhere);
- if (ds == null)
- {
- 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;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception ex)
{
@@ -206,11 +207,11 @@
",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HEndDate,HOrgID) " +
" Values('" + oBill.HNumber + "','" + oBill.HName + "','" + oBill.HHelpCode + "','" + oBill.HShortNumber + "'," + oBill.HParentID.ToString() +
"," + oBill.HLevel.ToString() + "," + Convert.ToString(oBill.HEndFlag ? 1 : 0) + "," + Convert.ToString(oBill.HStopflag ? 1 : 0) + ",'" + oBill.HRemark +
- "','" + oBill.HUseFlag + "',getdate(),'" + msg3 + "','" + oBill.HEndDate.ToString() + "'," + oBill.HOrgID.ToString()+
+ "','" + oBill.HUseFlag + "',getdate(),'" + msg3 + "','" + oBill.HEndDate.ToString() + "'," + oBill.HOrgID.ToString() +
")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update Gy_StockCheckItem set HEndflag=0 where HItemID=" + oBill.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -251,10 +252,50 @@
}
#endregion
+ #region 鐩樼偣鍒嗘瀽鍒楄〃鍒ゆ柇褰撳墠閫夋嫨鐨勭洏鐐规柟妗堟槸鍚︾敓鎴愯繃鍗曟嵁
+ [Route("Gy_StockCheckItemBill/StockItemSubIsExistence")]
+ [HttpGet]
+ public object StockItemSubIsExistence(string sID)
+ {
+ try
+ {
+ DataSet ds;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql;
+ sql = string.Format(@"select * from Gy_StockCheckItemSub where HInterID=" + sID);
+ ds = oCN.RunProcReturn(sql, "Gy_StockCheckItemSub");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛湭鐢熸垚";
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "宸茬敓鎴�";
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
#region 鐩樼偣鍒嗘瀽鍒楄〃
[Route("Gy_StockCheckItemBill/Get_InventoryAnalysisList")]
[HttpGet]
- public object Get_InventoryAnalysisList(string sWhere,string sID)
+ public object Get_InventoryAnalysisList(string sWhere, string sID)
{
DataSet ds;
List<object> list = new List<object>();
@@ -262,17 +303,33 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sID == null || sID == "")
+ //鍒ゆ柇鏄惁閫夋嫨鐩樼偣鏂规锛屾槸=>锛堢敤鐩樼偣鏂规瀛愯〃鍋氬姣旓級锛屽惁=>锛堢敤鍣ㄥ叿妗ｆ鍋氬姣旓級
+ if (sID==null|| sID == "")
{
- sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere);
+ if (sWhere=="pk")
+ {
+ sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK");
+ }
+ else
+ {
+ sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisList2 '{sWhere}'");
+ }
}
else
{
- sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere + " and HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")");
+ if (sWhere == "pk")
+ {
+ sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK2 WHERE HInterID="+ sID);
+ }
+ else
+ {
+ sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisList '{sID}','{sWhere}'");
+ }
}
- ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp");
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_MouldInventoryAnalysisList");
list.Add(ds.Tables[0]);
- objJsonResult.code = "0";
+
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
objJsonResult.list = list;
@@ -297,22 +354,23 @@
try
{
ds = MouldStockBillMainTemp(sWhere);
- if (ds == null)
- {
- 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;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception ex)
{
@@ -329,11 +387,11 @@
string sql1 = string.Format(@"select * from h_v_Gy_MouldStockBillMainTempList where 1=1 ");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by 鍒跺崟鏃ユ湡 desc", "h_v_Gy_MouldStockBillMainTempList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_MouldStockBillMainTempList");
}
else
{
- string sql = sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by hitemid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_MouldStockBillMainTempList");
}
}
@@ -380,53 +438,74 @@
#region 鐩樼偣鍒嗘瀽瀹℃牳
#region 璋冩嫧鈥旂洿鎺ヨ皟鎷�
[Route("Gy_StockCheckItemBill/MakeProdMove")]
- [HttpGet]
- public object MakeProdMove(string HBarCode, string user, string userID,string HItemID)
+ [HttpPost]
+ public object MakeProdMove([FromBody] JObject msg)
{
try
{
- string HBillNo = "";
- Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
- DataSet ds1 = new DataSet();
- ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
- ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='"+ HItemID+"'", "Sc_MouldStockBillMain_Temp");
- DataRow dr = ds.Tables[0].Rows[0];
- DataRow dr1 = ds1.Tables[0].Rows[0];
- HInterID = DBUtility.ClsPub.CreateBillID("3814", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3814", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
+ string user = sArray[1].ToString();//user
+ string userID = sArray[2].ToString();//userID
+
+ //杞寲鏍煎紡
+ ListModels oListModels = new ListModels();
+ List<Models.Cls_InventoryAnalysisList> lsmain = new List<Models.Cls_InventoryAnalysisList>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Gy_StockCheckItemBill(msg2);
+
+ foreach (Models.Cls_InventoryAnalysisList item in lsmain)
+ {
+ var HBarCode = item.HBarCode;
+ var HItemID = item.HItemID;
+ string HDate = item.HMakeDate;
+ string HBillNo = "";
+ Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
+ ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
+ DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+ HInterID = DBUtility.ClsPub.CreateBillID("3814", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3814", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ string sql = "Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HMaker,HMakeDate" +
+ ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('3814','3814'," + HInterID + ",'" + HBillNo + "','" + HDate+"'"+
+ ", '" + user + "',getdate()" +
+ ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ") ";
+ string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
+ HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
+ HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
+ HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
+ //涓昏〃
+
+ oCn.BeginTran();
+ oCn.RunProc(sql);
+ oCn.RunProc(sql1);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
+ }
- string sql = "Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" +
- ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
- ") " +
- " values('3814','3814'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
- ", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
- ") ";
- string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
- HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
- HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
- HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
- //涓昏〃
-
- oCn.BeginTran();
- oCn.RunProc(sql);
- oCn.RunProc(sql1);
- oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
- oCn.Commit();
-
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
+
}
catch (Exception e)
{
@@ -443,51 +522,74 @@
#region 鐩樼泩鈥斿叾浠栧叆搴撳崟
[Route("Gy_StockCheckItemBill/MakeOtherIn")]
- [HttpGet]
- public object MakeOtherIn(string HBarCode, string user, string userID, string HItemID)
+ [HttpPost]
+ public object MakeOtherIn([FromBody] JObject msg)
{
try
{
- string HBillNo = "";
- Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
- DataSet ds1 = new DataSet();
- ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
- ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
- DataRow dr = ds.Tables[0].Rows[0];
- DataRow dr1 = ds1.Tables[0].Rows[0];
- HInterID = DBUtility.ClsPub.CreateBillID("3827", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3827", ref DBUtility.ClsPub.sExeReturnInfo, true);
- string sql = "Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" +
- ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
- ") " +
- " values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
- ", '" + user + "',getdate()" +
- ", " + dr1["HCorrespondentID"].ToString() + ","+ dr1["HCorrespondentTypeID"].ToString() + ","+ dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
- ") ";
- string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
- HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
- HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
- HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
- //涓昏〃
- oCn.BeginTran();
- oCn.RunProc(sql);
- oCn.RunProc(sql1);
- oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
- oCn.Commit();
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
+ string user = sArray[1].ToString();//user
+ string userID = sArray[2].ToString();//userID
+ //杞寲鏍煎紡
+ ListModels oListModels = new ListModels();
+ List<Models.Cls_InventoryAnalysisList> lsmain = new List<Models.Cls_InventoryAnalysisList>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Gy_StockCheckItemBill(msg2);
+
+ foreach (Models.Cls_InventoryAnalysisList item in lsmain)
+ {
+ var HBarCode = item.HBarCode;
+ var HItemID = item.HItemID;
+ string HBillNo = "";
+ string HDate = item.HMakeDate;
+ Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
+ ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
+ DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+ HInterID = DBUtility.ClsPub.CreateBillID("3827", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3827", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ string sql = "Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HMaker,HMakeDate" +
+ ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('3827','3827'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "',getdate()" +
+ ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),0,0,0,0" +
+ ", 0," + dr["HDeptID"].ToString() + ",'',0" +
+ ") ";
+
+ string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
+ HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
+ HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
+ HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
+
+ //涓昏〃
+ oCn.BeginTran();
+ oCn.RunProc(sql);
+ oCn.RunProc(sql1);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
+
}
catch (Exception e)
{
@@ -504,53 +606,72 @@
#region 鐩樹簭鈥斿鐞嗗嚭搴撳崟
[Route("Gy_StockCheckItemBill/MakeScrapOut")]
- [HttpGet]
- public object MakeScrapOut(string HBarCode, string user, string userID, string HItemID)
+ [HttpPost]
+ public object MakeScrapOut([FromBody] JObject msg)
{
try
{
- string HBillNo = "";
- Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
- DataSet ds1 = new DataSet();
- ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
- ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
- DataRow dr = ds.Tables[0].Rows[0];
- DataRow dr1 = ds1.Tables[0].Rows[0];
- HInterID = DBUtility.ClsPub.CreateBillID("3832", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3832", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
+ string user = sArray[1].ToString();//user
+ string userID = sArray[2].ToString();//userID
- string sql = "Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" +
- ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
- ") " +
- " values('3832','3832'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
- ", '" + user + "',getdate()" +
- ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
- ") ";
- string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
- HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
- HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
- HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ //杞寲鏍煎紡
+ ListModels oListModels = new ListModels();
+ List<Models.Cls_InventoryAnalysisList> lsmain = new List<Models.Cls_InventoryAnalysisList>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Gy_StockCheckItemBill(msg2);
+ foreach (Models.Cls_InventoryAnalysisList item in lsmain)
+ {
+ var HBarCode = item.HBarCode;
+ var HItemID = item.HItemID;
+ string HBillNo = "";
+ string HDate = item.HMakeDate;
+ Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
+ ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
+ DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+ HInterID = DBUtility.ClsPub.CreateBillID("3832", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3832", ref DBUtility.ClsPub.sExeReturnInfo, true);
- //涓昏〃
- oCn.BeginTran();
- oCn.RunProc(sql);
- oCn.RunProc(sql1);
- oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
- oCn.Commit();
+ string sql = "Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HMaker,HMakeDate" +
+ ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('3832','3832'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "',getdate()" +
+ ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ") ";
+ string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
+ HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
+ HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
+ HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
+ //涓昏〃
+ oCn.BeginTran();
+ oCn.RunProc(sql);
+ oCn.RunProc(sql1);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
+ }
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
+
}
catch (Exception e)
{
@@ -567,46 +688,66 @@
#region 鍑哄簱鈥旈鐢ㄥ嚭搴撳崟
[Route("Gy_StockCheckItemBill/MakeProdOut")]
- [HttpGet]
- public object MakeProdOut(string HBarCode, string user, string userID, string HItemID)
+ [HttpPost]
+ public object MakeProdOut([FromBody] JObject msg)
{
try
{
- string HBillNo = "";
- Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
- DataSet ds1 = new DataSet();
- ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
- ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
- DataRow dr = ds.Tables[0].Rows[0];
- DataRow dr1 = ds1.Tables[0].Rows[0];
- HInterID = DBUtility.ClsPub.CreateBillID("3802", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3802", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
+ string user = sArray[1].ToString();//user
+ string userID = sArray[2].ToString();//userID
- string sql = "Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" +
- ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
- ") " +
- " values('3802','3802'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
- ", '" + user + "',getdate()" +
- ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
- ") ";
- string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
- HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
- HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
- HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",'1548785'," + dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
- //涓昏〃
- oCn.BeginTran();
- oCn.RunProc(sql);
- oCn.RunProc(sql1);
- oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
- oCn.Commit();
+ //杞寲鏍煎紡
+ ListModels oListModels = new ListModels();
+ List<Models.Cls_InventoryAnalysisList> lsmain = new List<Models.Cls_InventoryAnalysisList>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Gy_StockCheckItemBill(msg2);
+ foreach (Models.Cls_InventoryAnalysisList item in lsmain)
+ {
+ var HBarCode = item.HBarCode;
+ var HItemID = item.HItemID;
+ string HBillNo = "";
+ string HDate = item.HMakeDate;
+ Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
+ ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
+ DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+ HInterID = DBUtility.ClsPub.CreateBillID("3802", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3802", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ string sql = "Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HMaker,HMakeDate" +
+ ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('3802','3802'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "',getdate()" +
+ ", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ") ";
+ string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
+ HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
+ HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
+ HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",'1548785'," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
+
+ //涓昏〃
+ oCn.BeginTran();
+ oCn.RunProc(sql);
+ oCn.RunProc(sql1);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -629,53 +770,72 @@
#region 閫�搴撯�旈鐢ㄩ��搴撳崟
[Route("Gy_StockCheckItemBill/MakeProdBack")]
- [HttpGet]
- public object MakeProdBack(string HBarCode, string user, string userID, string HItemID)
+ [HttpPost]
+ public object MakeProdBack([FromBody] JObject msg)
{
try
- {
- string HBillNo = "";
- Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
- DataSet ds1 = new DataSet();
- ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
- ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
- DataRow dr = ds.Tables[0].Rows[0];
- DataRow dr1 = ds1.Tables[0].Rows[0];
- HInterID = DBUtility.ClsPub.CreateBillID("3803", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3803", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ { var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
+ string user = sArray[1].ToString();//user
+ string userID = sArray[2].ToString();//userID
- string sql = "Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" +
- ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
- ") " +
- " values('3803','3803'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
- ", '" + user + "',getdate()" +
- ", " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
- ") ";
- string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
- HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
- HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
- HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + ","+ dr["HNowSupID"].ToString() + ",0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ //杞寲鏍煎紡
+ ListModels oListModels = new ListModels();
+ List<Models.Cls_InventoryAnalysisList> lsmain = new List<Models.Cls_InventoryAnalysisList>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Gy_StockCheckItemBill(msg2);
+ foreach (Models.Cls_InventoryAnalysisList item in lsmain)
+ {
+ var HBarCode = item.HBarCode;
+ var HItemID = item.HItemID;
+ string HBillNo = "";
+ string HDate = item.HMakeDate;
+ Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
+ ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
+ DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+ HInterID = DBUtility.ClsPub.CreateBillID("3803", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3803", ref DBUtility.ClsPub.sExeReturnInfo, true);
- //涓昏〃
- oCn.BeginTran();
- oCn.RunProc(sql);
- oCn.RunProc(sql1);
- oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
- oCn.Commit();
+ string sql = "Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HMaker,HMakeDate" +
+ ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('3803','3803'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "',getdate()" +
+ ", " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ") ";
+ string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
+ HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
+ HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
+ HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
+ //涓昏〃
+ oCn.BeginTran();
+ oCn.RunProc(sql);
+ oCn.RunProc(sql1);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
+
}
catch (Exception e)
{
@@ -692,11 +852,11 @@
#region 鍏堥鐢ㄩ��搴撳啀棰嗙敤鍑哄簱
[Route("Gy_StockCheckItemBill/MakeProdOutBack")]
- [HttpGet]
- public object MakeProdOutBack(string HBarCode, string user, string userID, string HItemID)
+ [HttpPost]
+ public object MakeProdOutBack([FromBody] JObject msg)
{
- MakeProdBack(HBarCode, user, userID, HItemID);
- MakeProdOut(HBarCode, user, userID, HItemID);
+ MakeProdBack(msg);
+ MakeProdOut(msg);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
--
Gitblit v1.9.1