From 314085c79c3810aa50550023a095a3940042b897 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 20 十月 2025 14:51:55 +0800
Subject: [PATCH] 修复销售订单主表插入失败

---
 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs |   45 ++++++++++++++++++++++++++++-----------------
 1 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index db83923..e48fc84 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -479,14 +479,14 @@
                     ",'" + 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
 	                    ,HBillNo,HBillStatus
 	                    ,HAddress,HSSID,HSSDate,HCusID,HCurID,HExRate
 	                    ,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo
-	                    ,HChecker,HCheckDate,HMaker,HMakeDate,HCloseMan,HCloseDate,
+	                    ,HChecker,HCheckDate,HMaker,HMakeDate,HCloseMan,HCloseDate
 	                    ,HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID
 	                    ,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE,HCloseType)
                         values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1401 + "','" +
@@ -494,25 +494,36 @@
                     ",'" + 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].HCloseType + "'" + ")");
+                    + 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();

--
Gitblit v1.9.1