From 146fa02f2ff92f9687fc9e099e2e812f785e04b1 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 25 四月 2022 13:32:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 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 c94de60..175185b 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"
@@ -383,12 +383,13 @@
#region 鐩樼偣鍒嗘瀽瀹℃牳
#region 璋冩嫧鈥旂洿鎺ヨ皟鎷�
[Route("Gy_StockCheckItemBill/MakeProdMove")]
- [HttpGet]
- public object MakeProdMove(string msg)
+ [HttpPost]
+ public object MakeProdMove([FromBody] JObject msg)
{
try
{
- string msg1 = msg.ToString();
+ 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
@@ -439,8 +440,9 @@
oCn.RunProc(sql);
oCn.RunProc(sql1);
oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
}
- oCn.Commit();
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -464,12 +466,13 @@
#region 鐩樼泩鈥斿叾浠栧叆搴撳崟
[Route("Gy_StockCheckItemBill/MakeOtherIn")]
- [HttpGet]
- public object MakeOtherIn(string msg)
+ [HttpPost]
+ public object MakeOtherIn([FromBody] JObject msg)
{
try
{
- string msg1 = msg.ToString();
+ 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
@@ -489,8 +492,8 @@
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");
+ ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='W11201609050013'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='W11201609050013' and HItemID='38'", "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);
@@ -503,9 +506,10 @@
") " +
" 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" +
+ ", " + 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,
@@ -513,13 +517,15 @@
"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();
}
- oCn.Commit();
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -543,13 +549,13 @@
#region 鐩樹簭鈥斿鐞嗗嚭搴撳崟
[Route("Gy_StockCheckItemBill/MakeScrapOut")]
- [HttpGet]
- public object MakeScrapOut(string msg)
+ [HttpPost]
+ public object MakeScrapOut([FromBody] JObject msg)
{
try
{
- //var _value = msg["msg"].ToString();
- string msg1 = msg.ToString();
+ 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
@@ -599,8 +605,8 @@
oCn.RunProc(sql);
oCn.RunProc(sql1);
oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
}
- oCn.Commit();
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -624,13 +630,13 @@
#region 鍑哄簱鈥旈鐢ㄥ嚭搴撳崟
[Route("Gy_StockCheckItemBill/MakeProdOut")]
- [HttpGet]
- public object MakeProdOut(string msg)
+ [HttpPost]
+ public object MakeProdOut([FromBody] JObject msg)
{
try
{
- //var _value = msg["msg"].ToString();
- string msg1 = msg.ToString();
+ 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
@@ -680,8 +686,9 @@
oCn.RunProc(sql);
oCn.RunProc(sql1);
oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
}
- oCn.Commit();
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -704,12 +711,12 @@
#region 閫�搴撯�旈鐢ㄩ��搴撳崟
[Route("Gy_StockCheckItemBill/MakeProdBack")]
- [HttpGet]
- public object MakeProdBack(string msg)
+ [HttpPost]
+ public object MakeProdBack([FromBody] JObject msg)
{
try
- {//var _value = msg["msg"].ToString();
- string msg1 = msg.ToString();
+ { 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
@@ -759,8 +766,9 @@
oCn.RunProc(sql);
oCn.RunProc(sql1);
oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.Commit();
}
- oCn.Commit();
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
@@ -784,8 +792,8 @@
#region 鍏堥鐢ㄩ��搴撳啀棰嗙敤鍑哄簱
[Route("Gy_StockCheckItemBill/MakeProdOutBack")]
- [HttpGet]
- public object MakeProdOutBack(string msg)
+ [HttpPost]
+ public object MakeProdOutBack([FromBody] JObject msg)
{
MakeProdBack(msg);
MakeProdOut(msg);
--
Gitblit v1.9.1