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

yangle

2023-12-12 096f0a528fc003ad60d50155af11a40d14b9f0d9

 DAL/²Ö¿â¹ÜÀí/ClsKf_SellOutBillForLayUI.cs

@@ -47,6 +47,10 @@
                {
                    oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Back_Del " + lngBillKey.ToString());
                }
                else if (DetailColl[0].HSourceBillType == "1401")                    //销售订单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + lngBillKey.ToString());
                }
                else
                {

@@ -71,6 +75,10 @@
                else if (omodel.HMainSourceBillType == "退货通知单")
                {
                    oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Back_Add " + lngBillKey.ToString());
                }
                else if(DetailColl[0].HSourceBillType == "1401")                    //销售订单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Add " + lngBillKey.ToString());
                }
                else
                {
@@ -101,6 +109,7 @@
                ",HUpDateDate=getdate()" +
                //========================================
                ",HOrgID=" + omodel.HOrgID +
                ",HStockORGID=" + omodel.HOrgID +

                ",HEmpID=" + omodel.HEmpID.ToString() +
                ",HSupID=" + omodel.HSupID.ToString() +
@@ -196,7 +205,7 @@
                oCn.RunProc("Insert Into Kf_ICStockBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HOrgID" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HOrgID,HStockORGID" +
                ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID"+
                ",HSecManagerID,HSellSID,HCurID" +
                ",HLinkMan,HLinkPhone" +
@@ -205,7 +214,7 @@
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                "," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" + "," + omodel.HOrgID +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" + "," + omodel.HOrgID + "," + omodel.HOrgID +
                ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
                "," + omodel.HSecManagerID.ToString() + "," + omodel.HSellSID.ToString() + "," + omodel.HCurID.ToString() +
                ",'" + omodel.HLinkMan + "','" + omodel.HLinkPhone + "'" +