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

zrg

2024-03-11 6159710f5acbf63a715872b770abb46ab6825c2e

 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs

@@ -1095,14 +1095,65 @@
        /// <returns></returns>
        [Route("Cg_POOrderBill/DeltetCg_POOrderBill")]
        [HttpGet]
        public object DeltetCg_POOrderBill(string HInterID)
        public object DeltetCg_POOrderBill(string HInterID, string user)
        {
            try
            {

                string HBillNo = "";
                //删除前控制=========================================      
                string sql1 = "exec h_p_Cg_POOrderBill_BeforeDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
                ds = oCN.RunProcReturn(sql1, "h_p_Cg_POOrderBill_BeforeDelCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //==================================================================================  

                string sReturn = "";
                oCN.BeginTran();
                oCN.RunProc("Delete From Cg_POOrderBillMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From Cg_POOrderBillSub where HInterID = " + HInterID);
                oCN.Commit();

                //删除后控制==================================================================================      
                string sql2 = "exec h_p_Cg_POOrderBill_AfterDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
                ds = oCN.RunProcReturn(sql2, "h_p_Cg_POOrderBill_AfterDelCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "删除后判断失败，请与网络管理人员联系";
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + sReturn;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    sReturn = ds.Tables[0].Rows[0]["HRemark"].ToString();
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + sReturn;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;
                }
                //==============================================================================================

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
@@ -2010,6 +2061,43 @@
        }
        #endregion

        #region 采购订单 根据主内码与子内码获取采购订单数据
        [Route("Cg_POOrderBill/loadCg_POOrderBill_Push")]
        [HttpGet]
        public object loadCg_POOrderBill_Push(long HInterID, long HSubID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_POOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到源单信息！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }

}