From ef10f06e96034f6ab3db93ea103f2a4d78fcb2b9 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 13 五月 2024 17:32:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 86 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 37 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 84248b3..ea87715 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"
@@ -27,22 +27,12 @@
{
ds = StockCheckItemList(sWhere);
- //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)
{
@@ -56,7 +46,7 @@
public static DataSet StockCheckItemList(string sWhere)
{
- string sql1 = string.Format(@"select * from h_v_Gy_StockCheckItemList");
+ string sql1 = string.Format(@"select * from h_v_Gy_StockCheckItemList where 1=1 ");
if (sWhere == null || sWhere.Equals(""))
{
return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_StockCheckItemList");
@@ -336,20 +326,29 @@
//鍒ゆ柇鏄惁閫夋嫨鐩樼偣鏂规锛屾槸=>锛堢敤鐩樼偣鏂规瀛愯〃鍋氬姣旓級锛屽惁=>锛堢敤鍣ㄥ叿妗ｆ鍋氬姣旓級
if (sID == null || sID == "")
{
- if (sWhere == "pk")
- {
- sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK");
- }
- else
- {
- sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisList2 '{sWhere}'");
- }
+ //if (sWhere == "pk")
+ //{
+ // sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK");
+ //}
+ //else
+ //{
+ // sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisList2 '{sWhere}'");
+ //}
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鐩樼偣鏂规!";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
if (sWhere == "pk")
{
sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisPK '{sID}'");
+ }
+ else if (sWhere == "py")
+ {
+ sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisPY '{sID}'");
}
else
{
@@ -469,7 +468,7 @@
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 HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName+"'", "Gy_StockCheckItem");
@@ -513,7 +512,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
@@ -558,7 +557,7 @@
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 HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName + "'", "Gy_StockCheckItem");
@@ -582,19 +581,32 @@
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 HBillType = "";
+ if (item.HRealPotType == "浠撳簱" )
+ {
+ HBillType = "3827";
+ HInterID = DBUtility.ClsPub.CreateBillID("3827", ref DBUtility.ClsPub.sExeReturnInfo);
+ HBillNo = DBUtility.ClsPub.CreateBillCode("3827", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+ else if (item.HRealPotType != "浠撳簱")
+ {
+ HBillType = "3802";
+ 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,HRemark" +
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3827','3827'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- ", '" + user + "','" +HDate + "','" + sName + "'" +
+ " values('"+ HBillType + "','" + HBillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", '" + user + "','" + HDate + "','" + sName + "'" +
", " + 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,
@@ -602,7 +614,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
@@ -648,7 +660,7 @@
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 HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName+"'", "Gy_StockCheckItem");
@@ -692,7 +704,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',0,0,'',''," +
"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + ",0,0," +
"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + ",0,0,0,0"
- + ",0,0,0," + userID + ",0,100005,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
}
else
{
@@ -715,7 +727,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
}
//涓昏〃
@@ -761,7 +773,7 @@
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 HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName + "'", "Gy_StockCheckItem");
@@ -804,7 +816,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
@@ -849,7 +861,7 @@
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 HOrgID = sArray[2].ToString();//HOrgID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName + "'", "Gy_StockCheckItem");
@@ -882,9 +894,9 @@
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
" values('3803','3803'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- ", '" + user + "','" +HDate + "','" + sName + "'" +
+ ", '" + user + "','"+ HDate + "','" + sName + "'" +
", " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
+ ", 0," + dr["HDeptID"].ToString() + ",getdate(),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,
@@ -892,7 +904,7 @@
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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,'')");
+ + ",0,0,0," + HOrgID + ",0,100005,'')");
//涓昏〃
oCn.BeginTran();
--
Gitblit v1.9.1