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

yangle

2024-06-05 e42e0a80cc8e79a2a92a88c1e118157644630a13

 WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs

@@ -541,7 +541,16 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //进行 会计期间 结账 的判断和控制
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                DateTime HDate = DateTime.Now;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.Message = s;
                    return objJsonResult;
                }

                //进行需要进行的审核/反审核操作
                if (IsAudit == 0) //审核提交
@@ -578,21 +587,12 @@
                    }
                    //==================================================================================      

                    //进行 会计期间 结账 的判断和控制
                    string s = "";
                    int sYear = 0;
                    int sPeriod = 0;
                    DateTime HDate = DateTime.Now;
                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                    {
                        objJsonResult.Message = s;
                        return objJsonResult;
                    }

                    //审核提交
                    oCN.BeginTran();
                    //增加关联
                    oCN.RunProc("exec h_p_Kf_SellOutBill_Check " + HInterID + ",'" + oBill.BillType + "','" + CurUserName + "'");
                    //审核更新 及时库存表 减少库存
                    ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory  '" + HInterID + "','" + oBill.BillType + "','1'", "h_KF_UPDateICinventory");
                    //写入日志
                    string WorkList = "审核单据，单据号：" + oBill.omodel.HBillNo;
                    string SystemName = "LMES-销售出库单模块";
@@ -671,17 +671,6 @@
                        return objJsonResult;
                    }
                    //===========================================================         

                    //进行 会计期间 结账 的判断和控制
                    string s = "";
                    int sYear = 0;
                    int sPeriod = 0;
                    DateTime HDate = DateTime.Now;
                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                    {
                        objJsonResult.Message = s;
                        return objJsonResult;
                    }

                    //反审核提交AbandonCheck
                    //删除关联