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

yusijie

2022-12-07 048243255e2f36b32ab43cd9a8e05c7e608ad48b

 WebAPI/Controllers/BaseSet/Gy_UnitController.cs

@@ -1,5 +1,7 @@
using Newtonsoft.Json;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using Pub_Class;
using System;
using System.Collections;
@@ -7,6 +9,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Controllers.SCGL.日计划管理;
using WebAPI.Models;
using WebAPI.Service;

@@ -28,7 +31,7 @@
        /// </summary>
        [Route("Gy_Unit/list1")]
        [HttpGet]
        public object list(string sWhere,string user,string Organization)
        public object list(string sWhere, string user, string Organization)
        {
            try
            {
@@ -268,7 +271,7 @@
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oItem.HRate= msg_HRate;//换算比例
                    oItem.HRate = msg_HRate;//换算比例
                    oBill.oModel = oItem;
                }

@@ -312,6 +315,50 @@
            }
        }

        [Route("Gy_Unit/SaveGy_UnitListApi")]
        [HttpPost]
        public object SaveGy_UnitListApi([FromBody] JObject msg)
        {
            try
            {
                var _value = msg["model"].ToString();
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ListModels oListModels = new ListModels();
                List<Model.ClsGy_Unit_Model> lsmain = new List<Model.ClsGy_Unit_Model>();
                lsmain = oListModels.getObjectByJson_Gy_Unit(_value);
                string sql = string.Empty;
                //保存
                oCN.BeginTran();
                sql = $"delete Gy_Unit where HItemID = {lsmain[0].HItemID}";
                oCN.RunProc(sql);
                sql = "set identity_insert Gy_Unit on";
                oCN.RunProc(sql);
                oCN.RunProc("Insert into Gy_Unit" +
                    " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID) " +
                    " Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID.ToString() +
                    "," + lsmain[0].HLevel.ToString() + "," + Convert.ToString(lsmain[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(lsmain[0].HStopflag ? 1 : 0) + ",'" + lsmain[0].HRemark +
                    "'," + lsmain[0].HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(lsmain[0].HStandard) + "," + lsmain[0].HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                sql = "set identity_insert Gy_Unit off";
                oCN.RunProc(sql);
                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        /// <summary>
        /// 计量单位获取信息
        /// </summary>
@@ -330,7 +377,7 @@
        /// <returns></returns>
        [Route("DeltetGy_Unit")]
        [HttpGet]
        public object DeltetGy_Unit(string HItemID,string user)
        public object DeltetGy_Unit(string HItemID, string user)
        {
            DataSet ds;
            //string ModRightNameCheck = "Sc_ProcessReport_check";