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

zrg

2024-03-12 1093f17984977cee0dcfa9bf0ecc9888fa40e5c4

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

@@ -36,58 +36,41 @@
        public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
        {
            //收料通知单 é€€æ–™é€šçŸ¥å• å…³è”数量
            //try
            //{
            //    if (omodel.HMainSourceBillType == "发货通知单")
            //    {
            //        oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Del " + lngBillKey.ToString());
            //    }
            //    else if (omodel.HMainSourceBillType == "退货通知单")
            //    {
            //        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
            //    {
            try
            {
                if (DetailColl[0].HSourceBillType == "1401")                    //销售订单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_Delete " + lngBillKey.ToString());
                }
                else
                {

            //    }
            //}
            //catch (Exception e)
            //{
            //    throw (e);
            //}
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }

        //新增关联
        public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
        {
            //收料通知单 é€€æ–™é€šçŸ¥å• å…³è”数量
            //try
            //{
            //    if (omodel.HMainSourceBillType == "发货通知单")
            //    {
            //        oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Add " + lngBillKey.ToString());
            //    }
            //    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
            //    {
            try
            {
                if (DetailColl[0].HSourceBillType == "1401")                    //销售订单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_Add " + lngBillKey.ToString());
                }
                else
                {

            //    }
            //}
            //catch (Exception e)
            //{
            //    throw (e);
            //}
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }

        //修改单据
@@ -150,6 +133,8 @@
                    " where HInterID = " + lngBillKey;
                //更新主表
                oCn.RunProc(mainSql);
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
@@ -224,7 +209,9 @@

                    oCn.RunProc(subSql);
                }

                //更新订单关联数量
                AddNewRelation(ref sReturn, omodel.HInterID);
                //控制关联数量
                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("exec h_p_Kf_SellOutBackBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBackBill_AfterSaveCtrl");
                if (ds2 == null)
@@ -418,6 +405,10 @@

                }

                //更新订单关联数量
                AddNewRelation(ref sReturn, omodel.HInterID);
                //控制关联数量

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("exec h_p_Kf_SellOutBackBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBackBill_AfterSaveCtrl");
                if (ds2 == null)