Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zrg

2024-01-26 e10f00439ddd0abb9bbbcf3f4b5b2c7e882db5bd

 DAL/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBill.cs

@@ -116,7 +116,7 @@
                    string subSql = "Insert into Xs_SeOrderBillSub" +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
                        ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
                        ",HCusMaterNumber,HCusModel,HCusMaterName ) " +
                        ",HCusMaterNumber,HCusModel,HCusMaterName,HisStockGoods) " +
                        "values(" +
                        "" + omodel.HInterID +
                        "," + oSub.HEntryID +
@@ -146,7 +146,8 @@
                        "','" + oSub.HCusMaterNumber +
                        "','" + oSub.HCusModel +
                        "','" + oSub.HCusMaterName +
                        "')";
                        "'," + (oSub.HisStockGoods?1:0) +
                        ")";
                    oCn.RunProc(subSql);
                }
                //
@@ -291,7 +292,7 @@
                    string subSql = "Insert into Xs_SeOrderBillSub" +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
                        ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
                        ",HCusMaterNumber,HCusModel,HCusMaterName) " +
                        ",HCusMaterNumber,HCusModel,HCusMaterName,HisStockGoods) " +
                        "values(" +
                        "" + omodel.HInterID +
                        "," + oSub.HEntryID +
@@ -321,7 +322,8 @@
                        "','" + oSub.HCusMaterNumber +
                        "','" + oSub.HCusModel +
                        "','" + oSub.HCusMaterName +
                        "')";
                        "'," + (oSub.HisStockGoods?1:0) +
                        ")";
                    oCn.RunProc(subSql);
                }
                //
@@ -445,7 +447,8 @@
                    oSub.HRelTaxPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelTaxPrice"]);
                    oSub.HOutStockQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HOutStockQty"]);
                    oSub.HInvoiceQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HInvoiceQty"]);
                    
                    oSub.HisStockGoods = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HisStockGoods"]) == 1 ? true : false;

                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";