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

yangle

2024-06-11 4b7075beba3ac2f75bd295fb1c413cd514ce1a4c

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -1775,9 +1775,40 @@
                //进行需要进行的关闭/反关闭操作
                if (IsAudit == 0) //关闭提交
                {
                    oBill.oCn.BeginTran();
                    //关闭提交
                    if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        //关闭后控制=========================================      
                        string sql_afterClose = "exec h_p_Xs_SeOrderBill_AfterCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
                        DataSet ds_afterClose = oBill.oCn.RunProcReturn(sql_afterClose, "h_p_Xs_SeOrderBill_AfterCloseCtrl");
                        if (ds_afterClose == null || ds_afterClose.Tables[0].Rows.Count <= 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "关闭失败，原因：关闭后控制错误，请联系网络管理人员！";
                            objJsonResult.data = null;
                            oBill.oCn.RollBack();

                            return objJsonResult;
                        }
                        else
                        {
                            if (ds_afterClose.Tables[0].Rows[0]["HBack"].ToString() != "0")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "关闭失败，原因：" + ds_afterClose.Tables[0].Rows[0]["HRemark"].ToString();
                                objJsonResult.data = null;
                                oBill.oCn.RollBack();

                                return objJsonResult;
                            }
                        }
                        //=========================================

                        oBill.oCn.Commit();

                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "关闭成功";
@@ -1786,6 +1817,8 @@
                    }
                    else
                    {
                        oBill.oCn.RollBack();

                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
@@ -1961,7 +1994,7 @@
                if (IsAudit == 0) //行关闭提交
                {
                    //行关闭提交
                    if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, "h_p_Xs_SeOrderBill_AfterEntryCloseCtrl", ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;