From 33cfe29fcdd731c3c759dcae74bdcfaeecd309ea Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 15 十一月 2023 17:57:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index 89a256a..0192a59 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -36,7 +36,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where HitemID=" + HInterID, "h_v_IF_SeOutStockBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -234,7 +234,9 @@
long HCusID = mainList[0].HCusID; //瀹㈡埛
string HAddress = mainList[0].HAddress;//鍦板潃
long HSSID = mainList[0].HSSID;//缁撶畻鏂瑰紡
-
+ long HConveyTypeID = mainList[0].HConveyTypeID;//杩愯緭鏂瑰紡
+ long HConveyCompID = mainList[0].HConveyCompID;//杩愯緭鍏徃
+ long HConveyMoney = (long)mainList[0].HConveyMoney;//杩愯垂
long HDFflag = Convert.ToInt32(mainList[0].HDFflag); //鏄惁鍨粯
@@ -256,30 +258,40 @@
long HDELIVERYORGID = mainList[0].HDELIVERYORGID;
long HOWNERID = mainList[0].HOWNERID;
string HOWNERTYPEID = mainList[0].HOWNERTYPEID;
+ string HLinkMan = mainList[0].HLinkMan;
+ string HLinkPhone = mainList[0].HLinkPhone;
+ string HSeOrderBillNo_M = mainList[0].HSeOrderBillNo_M;
ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_SeOutStockBillList");
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
//涓昏〃
- oCN.RunProc(@"Insert Into Xs_SeOutStockBillMain
+ string sql = $@"Insert Into Xs_SeOutStockBillMain
(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
,HCusID,HManagerID,HDeptID,HRemark,HMaker,HMakeDate
- ,HAddress,HSSID,HCurID,HWHID,HExRate,HEmpID,HExplanation,HInnerBillNo
- ,HSALEORGID,HDELIVERYORGID,HOWNERID,HOWNERTYPEID
+ ,HAddress,HSSID,HCurID,HWHID,HExRate,HEmpID,HExplanation,HInnerBillNo,HSeOrderBillNo_M
+ ,HConveyTypeID,HConveyCompID,HConveyMoney,HLinkMan,HLinkPhone
+ ,HSALEORGID,HDELIVERYORGID,HOWNERID,HOWNERTYPEID
,HChecker,HCheckDate,HCloseMan,HCloseDate,HERPInterID,HERPBillType,HDFflag)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1402 + "','" +
1402 + "','" + HDate + "','" + HBillNo + "'," + HBillStatus + "," + HCusID +
"," + HManagerID + "," + HDeptID + ",'" + HRemark + "','" + HMaker + "','" + HMakeDate +
"','" + HAddress + "'," + HSSID + "," + HCurID + "," + HWHID + "," + HExRate + "," + HEmpID + ",'" +
- HExplanation + "','" + HInnerBillNo + "'," + HSALEORGID + "," + HDELIVERYORGID + "," + HOWNERID + ",'"
+ HExplanation + "','" + HInnerBillNo + "','" + HSeOrderBillNo_M + "','" + HConveyTypeID + "','" + HConveyCompID + "','" + HConveyMoney + "','" + HLinkMan + "','" + HLinkPhone + "'," + HSALEORGID + "," + HDELIVERYORGID + "," + HOWNERID + ",'"
+ HOWNERTYPEID + "','" + HChecker + "','" + HCheckDate + "','" + HCloseMan + "','" + HCloseDate + "'," + HERPInterID +
- ",'" + HERPBillType + "'," + HDFflag + ")");
+ ",'" + HERPBillType + "'," + HDFflag + ")";
+
+ oCN.RunProc(sql);
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
- oCN.RunProc("update Xs_SeOutStockBillMain set " +
- "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" + "' where HInterID=" + HInterID);
+ string sql = $@"update Xs_SeOutStockBillMain set " +
+ "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
+ ",HCurID=" + HCurID + ", HWHID = " + HWHID
+ + ",HExRate=" + HExRate + ",HEmpID=" + HEmpID + ",HSeOrderBillNo_M=" + HSeOrderBillNo_M + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID + ",HOWNERID=" + HOWNERID
+ + ",HAddress='" + HAddress + "'where HInterID=" + HInterID;
+ oCN.RunProc(sql);
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Xs_SeOutStockBillSub where HInterID='" + HInterID + "'");
@@ -317,6 +329,7 @@
List<ClsXs_SeOutStockBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOutStockBillSub>>(msg3);
int i = 0;
+ IList list = DetailColl;
foreach (ClsXs_SeOutStockBillSub oSub in DetailColl)
{
i++;
@@ -365,14 +378,16 @@
NewHEntryID += 1;
}
- oCN.RunProc($@"Insert into Xs_SeOutStockBillSub
+ string sql=$@"Insert into Xs_SeOutStockBillSub
(HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice,HMoney,HWHID,HSPID,HRemark
,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HSeOrderInterID,HSeOrderEntryID,HSeORderBillNo
- ,HOWNERID,HOWNERTYPEID,HSETTLEORGID,HMoveStockQty
+ ,HOWNERID,HOWNERTYPEID,HMoveStockQty
,HRelationQty,HAuxPropID,HBatchNO,HMTONo,HERPInterID,HERPEntryID)
values({HInterID},{NewHEntryID},{oSub.HMaterID},{oSub.HUnitID},{oSub.HQty}
- ,{oSub.HPrice},{oSub.HMoney},{oSub.HWHID},{oSub.HSPID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeORderBillNo}',{oSub.HOWNERID},'{oSub.HOWNERTYPEID}',{oSub.HSETTLEORGID},{oSub.HMoveStockQty},{oSub.HRelationQty}
- ,{oSub.HAuxPropID},'{oSub.HBatchNO}','{oSub.HMTONo}',{oSub.HERPInterID},{oSub.HERPEntryID})");
+ ,{oSub.HPrice},{oSub.HMoney},{oSub.HWHID},{oSub.HSPID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeORderBillNo}',{oSub.HOWNERID},'{oSub.HOWNERTYPEID}',{oSub.HMoveStockQty},{oSub.HRelationQty}
+ ,{oSub.HAuxPropID},'{oSub.HBatchNO}','{oSub.HMTONo}',{oSub.HERPInterID},{oSub.HERPEntryID})";
+
+ oCN.RunProc(sql);
}
objJsonResult.code = "1";
--
Gitblit v1.9.1