From 63be464a9bfbfa9412fa7809612418c150eab478 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 24 十月 2025 13:36:15 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 66 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 21a4668..e48fc84 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -445,7 +445,7 @@
}
}
- #region [鍚屾鎻掍欢]
+ #region [閿�鍞鍗曞悓姝ユ彃浠禲
[Route("Xs_SeOrderBill/Xs_SeOrderBillSaveApi")]
[HttpPost]
public object Xs_SeOrderBillSaveApi([FromBody] JObject sMainSub)
@@ -457,7 +457,6 @@
var entry = sMainSub["model"]["HENTRY"].ToString();
model = "[" + model.ToString() + "]";
- LogService.Write("閿�鍞鍗曞悓姝� sMainSub:" + sMainSub);
List<ClsXs_SeOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillMain>>(model);
List<ClsXs_SeOrderBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillSub>>(entry);
string sql = string.Empty;
@@ -474,13 +473,13 @@
, HEmpID, HManagerID, HDeptID, HExplanation, HRemark, HInnerBillNo
, HChecker, HCheckDate, HMaker, HMakeDate, HCloseMan, HCloseDate
, HERPInterID, HERPBillType, HSALEORGID, HSALEGROUPID, HRECEIVEID, HSETTLEID
- , HCHARGEID, HHEADLOCID, HRECCONTACTID, HCORRESPONDORGID, HBUSINESSTYPE)
+ , HCHARGEID, HHEADLOCID, HRECCONTACTID, HCORRESPONDORGID, HBUSINESSTYPE,HCloseType)
values(" + mainList[0].HInterID + ", " + DateTime.Now.Year + ", " + DateTime.Now.Month + ", '" + 1401 + "', '" +
mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "','" + mainList[0].HAddress + "'," + mainList[0].HSSID +
",'" + mainList[0].HSSDate + "'," + mainList[0].HCusID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + "," + mainList[0].HEmpID + "," + mainList[0].HManagerID + "," + mainList[0].HDeptID + ",'" + mainList[0].HExplanation + "','" + mainList[0].HRemark + "','" +
mainList[0].HInnerBillNo + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HMaker + "','" + mainList[0].HMakeDate + "','"
+ mainList[0].HCloseMan + "','" + mainList[0].HCloseDate + "'," + mainList[0].HERPInterID + ",'"
- + mainList[0].HERPBillType + "'," + mainList[0].HSALEORGID + "," + mainList[0].HSALEGROUPID + "," + mainList[0].HRECEIVEID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + "," + mainList[0].HHEADLOCID + "," + mainList[0].HRECCONTACTID + "," + mainList[0].HCORRESPONDORGID + ",'" + mainList[0].HBUSINESSTYPE + "'" + ")");
+ + mainList[0].HERPBillType + "'," + mainList[0].HSALEORGID + "," + mainList[0].HSALEGROUPID + "," + mainList[0].HRECEIVEID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + "," + mainList[0].HHEADLOCID + "," + mainList[0].HRECCONTACTID + "," + mainList[0].HCORRESPONDORGID + ",'" + mainList[0].HBUSINESSTYPE + "')");
//涓昏〃
oCN.RunProc(@"Insert Into Xs_SeOrderBillMain
(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate
@@ -489,31 +488,42 @@
,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo
,HChecker,HCheckDate,HMaker,HMakeDate,HCloseMan,HCloseDate
,HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID
- ,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE)
+ ,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE,HCloseType)
values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1401 + "','" +
mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "','" + mainList[0].HAddress + "'," + mainList[0].HSSID +
",'" + mainList[0].HSSDate + "'," + mainList[0].HCusID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + "," + mainList[0].HEmpID + "," + mainList[0].HManagerID + "," + mainList[0].HDeptID + ",'" + mainList[0].HExplanation + "','" + mainList[0].HRemark + "','" +
mainList[0].HInnerBillNo + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HMaker + "','" + mainList[0].HMakeDate + "','"
+ mainList[0].HCloseMan + "','" + mainList[0].HCloseDate + "'," + mainList[0].HERPInterID + ",'"
- + mainList[0].HERPBillType + "'," + mainList[0].HSALEORGID + "," + mainList[0].HSALEGROUPID + "," + mainList[0].HRECEIVEID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + "," + mainList[0].HHEADLOCID + "," + mainList[0].HRECCONTACTID + "," + mainList[0].HCORRESPONDORGID + ",'" + mainList[0].HBUSINESSTYPE + "'" + ")");
+ + mainList[0].HERPBillType + "'," + mainList[0].HSALEORGID + "," + mainList[0].HSALEGROUPID + "," + mainList[0].HRECEIVEID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + "," + mainList[0].HHEADLOCID + "," + mainList[0].HRECCONTACTID + "," + mainList[0].HCORRESPONDORGID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HCloseType + "')");
//淇濆瓨瀛愯〃
foreach (var oSub in subList)
{
sql = $@"
-Insert into Xs_SeOrderBillSub
-(HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice
- ,HTaxPrice,HDiscountRate,HRelTaxPrice,HMoney,HTaxRate,HTaxMoney
- ,HLineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark
- ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
- ,HRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo
- ,HERPInterID,HERPEntryID,HBackRelationQty,HWhID,HSPID
- ,HSTOCKORGID,HOWNERID,HOWNERTYPEID,HMAPID,HSTOCKUNITID,HBASEUNITID
- ,HBFLOWID,HSETTLEORGID,HTAXCOMBINATION,HPRICEUNITID,HISFREE,HPRICECOEFFICIENT
- ,HSYSPRICE,HLIMITDOWNPRICE,HPARENTMATID,HROWTYPE,HROWID,HPARENTROWID
- ,HDELIVERYCONTROL,HLOCALCURRID,HEXCHANGETYPEID,HSETTLECURRID,HSETTLEMODEID
- ,HRECCONDITIONID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HEXCHANGERATE,HTAXRATEID
- ,HCOSTPERCENT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HPRICELISTENTRY)
-values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}','{oSub.HTaxPrice}','{oSub.HDiscountRate}','{oSub.HRelTaxPrice}','{oSub.HMoney}','{oSub.HTaxRate}','{oSub.HTaxMoney}','{oSub.HLineTotal}','{oSub.HlineTotalBB}','{oSub.HDate}','{oSub.HOutStockQty}','{oSub.HInvoiceQty}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HRelationQty}','{oSub.HPropertyID}','{oSub.HBatChNo}','{oSub.HAuxPropID}','{oSub.HMTONo}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HWhID}','{oSub.HSPID}','{oSub.HSTOCKORGID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HMAPID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}','{oSub.HBFLOWID}','{oSub.HSETTLEORGID}','{oSub.HTAXCOMBINATION}','{oSub.HPRICEUNITID}','{oSub.HISFREE}','{oSub.HPRICECOEFFICIENT}','{oSub.HSYSPRICE}','{oSub.HLIMITDOWNPRICE}','{oSub.HPARENTMATID}','{oSub.HROWTYPE}','{oSub.HROWID}','{oSub.HPARENTROWID}','{oSub.HDELIVERYCONTROL}','{oSub.HLOCALCURRID}','{oSub.HEXCHANGETYPEID}','{oSub.HSETTLECURRID}','{oSub.HSETTLEMODEID}','{oSub.HRECCONDITIONID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HEXCHANGERATE}','{oSub.HTAXRATEID}','{oSub.HCOSTPERCENT}','{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HPRICELISTENTRY}')";
+ Insert into Xs_SeOrderBillSub
+ (HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice
+ ,HTaxPrice,HDiscountRate,HRelTaxPrice,HMoney,HTaxRate,HTaxMoney
+ ,HLineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
+ ,HRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo
+ ,HERPInterID,HERPEntryID,HBackRelationQty,HWhID,HSPID
+ ,HSTOCKORGID,HOWNERID,HOWNERTYPEID,HMAPID,HSTOCKUNITID,HBASEUNITID
+ ,HBFLOWID,HSETTLEORGID,HTAXCOMBINATION,HPRICEUNITID,HISFREE,HPRICECOEFFICIENT
+ ,HSYSPRICE,HLIMITDOWNPRICE,HPARENTMATID,HROWTYPE,HROWID,HPARENTROWID
+ ,HDELIVERYCONTROL,HLOCALCURRID,HEXCHANGETYPEID,HSETTLECURRID,HSETTLEMODEID
+ ,HRECCONDITIONID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HEXCHANGERATE,HTAXRATEID
+ ,HCOSTPERCENT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HPRICELISTENTRY)
+ values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}'
+ ,'{oSub.HTaxPrice}','{oSub.HDiscountRate}','{oSub.HRelTaxPrice}','{oSub.HMoney}','{oSub.HTaxRate}','{oSub.HTaxMoney}'
+ ,'{oSub.HLineTotal}','{oSub.HlineTotalBB}','{oSub.HDate}','{oSub.HOutStockQty}','{oSub.HInvoiceQty}','{oSub.HRemark}'
+ ,'{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}'
+ ,'{oSub.HRelationQty}','{oSub.HPropertyID}','{oSub.HBatChNo}','{oSub.HAuxPropID}','{oSub.HMTONo}'
+ ,'{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HWhID}','{oSub.HSPID}'
+ ,'{oSub.HSTOCKORGID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HMAPID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}'
+ ,'{oSub.HBFLOWID}','{oSub.HSETTLEORGID}','{oSub.HTAXCOMBINATION}','{oSub.HPRICEUNITID}','{oSub.HISFREE}','{oSub.HPRICECOEFFICIENT}'
+ ,'{oSub.HSYSPRICE}','{oSub.HLIMITDOWNPRICE}','{oSub.HPARENTMATID}','{oSub.HROWTYPE}','{oSub.HROWID}','{oSub.HPARENTROWID}'
+ ,'{oSub.HDELIVERYCONTROL}','{oSub.HLOCALCURRID}','{oSub.HEXCHANGETYPEID}','{oSub.HSETTLECURRID}','{oSub.HSETTLEMODEID}'
+ ,'{oSub.HRECCONDITIONID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HEXCHANGERATE}','{oSub.HTAXRATEID}'
+ ,'{oSub.HCOSTPERCENT}','{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HPRICELISTENTRY}')";
oCN.RunProc(sql);
}
oCN.Commit();
@@ -1451,7 +1461,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillEdit where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -3376,6 +3386,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鍒ゆ柇鏌ヨ鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
{
@@ -3395,9 +3406,18 @@
ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "',2", "h_p_Xs_SeOrderBillList_Query");
}
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -3537,7 +3557,7 @@
}
string sql = "select * from h_v_Xs_SeOrderBillQuerySub where hmainid = " + hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOrderBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Xs_SeOrderBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1