From 8a2f4c5977834d55b889bef3d01e1e02442b735c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 19 一月 2022 22:00:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 4399506..d1a3ca7 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"
@@ -418,7 +418,7 @@
oCn.BeginTran();
oCn.RunProc(sql);
oCn.RunProc(sql1);
- oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
@@ -465,7 +465,7 @@
") " +
" values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", " + 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,
@@ -479,7 +479,7 @@
oCn.BeginTran();
oCn.RunProc(sql);
oCn.RunProc(sql1);
- oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
@@ -527,7 +527,7 @@
") " +
" values('3832','3832'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", " + 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,
@@ -542,7 +542,7 @@
oCn.BeginTran();
oCn.RunProc(sql);
oCn.RunProc(sql1);
- oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
@@ -590,7 +590,7 @@
") " +
" values('3802','3802'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", " + 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,
@@ -598,13 +598,13 @@
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," + 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 KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
@@ -652,7 +652,7 @@
") " +
" values('3803','3803'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
+ ", " + 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,
@@ -660,14 +660,14 @@
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," + 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 KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
+ oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
oCn.Commit();
objJsonResult.code = "0";
--
Gitblit v1.9.1