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

yangle

2022-11-17 7b3b93e4d0f551d16869b92f5056ed3ca5c6c4eb

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -7,6 +7,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;
using WebAPI.Service;

@@ -20,6 +21,36 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;



        ////检测 当前选中行的 项目状态
        //[Route("Gy_Material/CheckUseStatus")]
        //[HttpGet]
        //public void Sub_CheckUseStatus(int grd, int IDCol, string sProcName)
        //{
        //    SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //    Int64 sItemID;
        //    try
        //    {
        //        //循环当前网格选中项目
        //        for (int i = 0; i < grd.SelectedRows.Count; i++)
        //        {
        //            //得到内码
        //            sItemID = DBUtility.ClsPub.isLong(grd.Rows[grd.SelectedRows[i].Index].Cells[IDCol].Value);
        //            //调用储存过程 h_p_Gy_CheckUseDept 
        //            oCn.RunProc("exec " + sProcName + " " + sItemID.ToString(), ref ClsPub.sExeReturnInfo);
        //        }
        //    }
        //    catch (Exception e)
        //    {
        //        MessageBox.Show("检测错误！原因：" + ClsPub.sExeReturnInfo);
        //        //objJsonResult.code = "0";
        //        //objJsonResult.count = 0;
        //        //objJsonResult.Message = "检测错误！原因：" + ClsPub.sExeReturnInfo;
        //        //objJsonResult.data = null;
        //        //return objJsonResult;
        //    }
        //}

        /// <summary>
        /// 返回物料列表
@@ -104,6 +135,7 @@
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            string msg_HUSEORGID = sArray[2].ToString();
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

@@ -253,7 +285,7 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

                    oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //组织id
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
@@ -353,7 +385,7 @@
                    return objJsonResult;
                }

                oCN.RunProc("update Gy_Material set HStopflag=1 where HItemID=" + HItemID);
                oCN.RunProc("delete from Gy_Material where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;
@@ -572,27 +604,21 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DataSet Ds, Ds2;
                DataSet Ds;
                Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID=" + lngBillKey.ToString(), "h_v_IF_BarCodeBillList");
                if (Ds.Tables[0].Rows.Count != 0)
                {
                    oCN.BeginTran();
                    Ds2 = oCN.RunProcReturn("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString(), "Gy_BarCodeBill");
                    if (Ds2.Tables[0].Rows.Count != 0)
                    {
                        oCN.Commit();
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "删除成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败";
                   oCN.BeginTran();
                   oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString());

                    oCN.Commit();
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除成功";
                    objJsonResult.data = null;
                    return objJsonResult;


                }
                else
                {
@@ -605,6 +631,7 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message;