yusijie
2025-09-13 f989e2e3dfb3866b5d9fe271f69c728eb5be242d
WebAPI/Controllers/MaterialHandingController.cs
@@ -86,12 +86,12 @@
        [Route("MaterialHandingController/OpenMaterial")]
        [HttpGet]
        public object OpenMaterial(int HInterID, int IsUse, string CurUserName)
        public object OpenMaterial(int HInterID, int IsUse, string CurUserName,string HMaterID)
        {
            try
            {
                var ds = oCN.RunProcReturn("select * from Gy_UserMaterRelation where HItemID=" + HInterID, "Gy_UserMaterRelation");
                var ds_1 = oCN.RunProcReturn("select * from Gy_UserMaterRelation where HMaterID=" + HMaterID+ "order by HItemID desc", "Gy_UserMaterRelation");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    IsUse = Convert.ToInt32(ds.Tables[0].Rows[0]["HUseFlag"]) ;
@@ -106,7 +106,19 @@
                            return objJsonResult;
                        }
                    }
                    else
                    {
                        if (ds_1.Tables[0].Rows.Count > 1)
                        {
                            string sql = "update Gy_UserMaterRelation  set HUseFlag=0 where HMaterID= " + "'" + HMaterID + "'" + "and HItemID!=" + HInterID;
                            oCN.BeginTran();
                            oCN.RunProc(sql);
                            oCN.Commit();
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
@@ -174,10 +186,14 @@
                    //================================================================================== 
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "启用成功";
                    objJsonResult.data = null;
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "启用成功";
                        objJsonResult.data = null;
                }
                //if (IsStop == 1) //反禁用判断
                //{
@@ -257,19 +273,23 @@
        #region 物料校验
        [Route("MaterialHandingController/CheckMaterial")]
        [HttpGet]
        public object CheckMaterial(string HMaterID, string user, int param,string OrganizationID)
        public object CheckMaterial(string HMaterID, string user, int param,string OrganizationID,string SupID)
        {
            try
            {
                //ds1获取的sql后期记得改回供应商,修改人->供应商
                var ds1 = oCN.RunProcReturn("select * from h_v_Gy_UserMaterRelationEdit where 物料代码='" + HMaterID + "'" + "and 修改人='" + user + "'", "h_v_Gy_UserMaterRelationEdit");
                var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + HMaterID+ "'", "Gy_Material");
                var ds1 = oCN.RunProcReturn("select * from h_v_Gy_UserMaterRelationEdit where 物料代码='" + HMaterID + "'" + "and 供应商代码='" + SupID + "'", "h_v_Gy_UserMaterRelationEdit");
                var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + HMaterID+ "'"+ " and HUSEORGID="+"'"+ OrganizationID+"'", "Gy_Material");
                if(ds.Tables[0].Rows.Count == 0)
                {
                    return 2;
                }
                if (param == 0)
                {
                    if (ds1.Tables[0].Rows.Count > 0)
                    if (ds1.Tables[0].Rows.Count > 0)//物料重复,弹出询问
                    {
                        return 1;
                    }
                    else
                    {
@@ -279,7 +299,7 @@
                else
                {
                    oCN.BeginTran();
                    string sqlUpd = "UPDATE Gy_UserMaterRelation set HUseFlag=0 where HMaterID="+ ds.Tables[0].Rows[0]["HItemID"];
                    string sqlUpd = "UPDATE Gy_UserMaterRelation set HUseFlag=0 where HItemID=" + ds1.Tables[0].Rows[0]["HItemID"];
                    oCN.RunProc(sqlUpd);
                    oCN.Commit();
@@ -365,8 +385,9 @@
                msg2 = "[" + msg2.ToString() + "]";
                List<Model.Cls_MaterialHandingModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Cls_MaterialHandingModel>>(msg2);
                var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + list[0].HMaterNumber + "'", "Gy_Material");
                int HItemID =Convert.ToInt32(list[0].HItemID);
                string HMaterNumber = list[0].HMaterNumber;
                int HMaterID =Convert.ToInt32(ds.Tables[0].Rows[0]["HItemID"]);
@@ -426,6 +447,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("送货物料信息保存异常:" + e.Message);
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;