ch
2021-07-12 e902e8a37f677b8e6615286f552e97db1e738bb2
nothing
7个文件已修改
1个文件已添加
278 ■■■■■ 已修改文件
WebAPI/Controllers/CellWidthController.cs 174 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MoveStockBillController.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CellWidthController.cs
New file
@@ -0,0 +1,174 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers
{
    public class CellWidthController : ApiController
    {
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public WebServer webserver = new WebServer();
        #region 单据保存列宽
        /// <summary>
        /// 单据列表保存
        /// </summary>
        /// <returns></returns>
        [Route("tb_CellWidth/GetMouldScrapInHouseCellWidth")]
        [HttpPost]
        public object GetMouldScrapInHouseCellWidth()
        {
            string Item = HttpContext.Current.Request["myMap"];
            string Name = HttpContext.Current.Request["Name"];
            string[] sArray = Item.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg3 = sArray[0].ToString();
            //按 },{来拆分数组 //去掉【和】
            msg3 = msg3.Substring(1, msg3.Length - 2);
            msg3 = msg3.Replace("\\", "");
            msg3 = msg3.Replace("\n", "");  //\n
            string[] myMap = msg3.Split(','); //字符串转数组
            SaveGridView(myMap, Name, HttpContext.Current.Server.MapPath("~/bin"));
            try
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功!";
                objJsonResult.data = null;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = ex.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region 列宽保存
        public object SaveGridView(string[] _value, string KeyItem, string AppPath)
        {
            string text = "";
            try
            {
                for (int i = 0; i <= _value.Length - 1; i++)
                {
                    bool flag = i == 0;
                    if (flag)
                    {
                        text = _value[i].ToString();
                    }
                    else
                    {
                        text = text + "," + _value[i].ToString();
                    }
                }
                ClsIni clsIni = new ClsIni();
                bool flag2 = ClsIni.WriteIni("GridSave", KeyItem, text, AppPath + "\\grdWidth.wyini");
                if (flag2)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "操作成功!";
                    objJsonResult.data = null;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作失败!";
                    objJsonResult.data = null;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message;
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region 列宽查询
        [Route("tb_CellWidth/GetMouldScrapInHouseCellWidthList")]
        [HttpGet]
        public object GetGridView(int colNum, string Name)
        {
            try
            {
                char c = Convert.ToChar(",");
                string text = ClsIni.ReadIni("GridSave", Name, HttpContext.Current.Server.MapPath("~/bin") + "\\grdWidth.wyini");
                bool flag = text != "没有找到!";
                if (flag)
                {
                    string[] array = text.Split(new char[]
                    {
                        c
                    });
                    bool flag2 = colNum > array.Length;
                    int num;
                    if (flag2)
                    {
                        num = array.Length;
                    }
                    else
                    {
                        num = colNum;
                    }
                    for (int i = 0; i < num; i++)
                    {
                        bool flag3 = ClsPub.isInt(array[i]) > 500;
                        if (flag3)
                        {
                            array[i] = ClsPub.isInt(array[i]).ToString();
                        }
                        else
                        {
                            array[i] = ClsPub.isInt(array[i]).ToString();
                        }
                    }
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取列宽成功!";
                    objJsonResult.data = array;
                }
                else
                {
                    objJsonResult.code = "-1";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无设置!";
                    objJsonResult.data = null;
                }
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "设置列宽失败!" + ex.Message;
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
    }
}
WebAPI/Controllers/MoveStockBillController.cs
@@ -364,14 +364,6 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //else
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "2-库存不足!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
                {
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -610,7 +610,16 @@
        public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList ", "h_v_Sc_MouldRepairWorkBillList");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList " + sWhere, "h_v_Sc_MouldRepairWorkBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
                string sql = sql1 + sWhere;
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
            }
        }
        #endregion
WebAPI/Controllers/Sc_MouldController.cs
@@ -73,8 +73,8 @@
                BillNew.omodel.HEmpID = 0;
                BillNew.omodel.HManagerID = mainList[0].HManagerID;
                BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
                BillNew.omodel.HKeeperID = mainList[0].HSecManagerID;
                BillNew.omodel.HDeptID = mainList[0].HSecManagerID;
                BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
                BillNew.omodel.HDeptID = mainList[0].HDeptID;
                BillNew.omodel.HExplanation = mainList[0].HExplanation;
                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
                BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
WebAPI/Controllers/WebAPIController.cs
@@ -1884,6 +1884,76 @@
            }
        }
        /// <summary>
        /// 获取扫码详情列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetWMSBarCodeDetailsList")]
        [HttpGet]
        public object GetWMSBarCodeDetailsList(int HInterID,string HBillType)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("Select * from h_v_KF_PonderationBillMain_Temp_Sum where HInterID=" + HInterID + " and HBillType='" + HBillType + "' Order by HItemID ", "h_v_KF_PonderationBillMain_Temp_Sum");
                //ds = oCN.RunProcReturn("Select top 10 * from h_v_KF_PonderationBillMain_Temp_Sum Order by HInterID ", "h_v_KF_PonderationBillMain_Temp_Sum");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// 根据ID删除缓存表中扫码记录
        /// </summary>
        /// <param name="sHitemID">缓存表ID</param>
        /// <returns>object</returns>
        [Route("Web/DelCacheList")]
        [HttpGet]
        public object DelCacheList(long sHitemID)
        {
            try
            {
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HitemID = " + sHitemID);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
        }
    }
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -162,10 +162,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/05/2021 16:23:19</publishTime>
      <publishTime>07/05/2021 13:46:25</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/05/2021 16:23:19</publishTime>
      <publishTime>07/05/2021 13:46:25</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -333,7 +333,7 @@
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/05/2021 16:23:25</publishTime>
      <publishTime>07/05/2021 13:46:40</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Web.config
@@ -17,8 +17,8 @@
    
  <appSettings>
      <!--服务器文件IP地址-->
    <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
    <add key="FileIP" value="http://localhost:8085/"/>
    <add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>
    <!--<add key="FileIP" value="http://localhost:8085/"/>-->
    <add key="webpages:Version" value="3.0.0.0" />
    <add key="webpages:Enabled" value="false" />
    <add key="ClientValidationEnabled" value="true" />
WebAPI/WebAPI.csproj
@@ -343,6 +343,7 @@
    <Compile Include="Controllers\BLL\Xt_SystemParameterController.cs" />
    <Compile Include="Controllers\BLL\Xt_UserController.cs" />
    <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
    <Compile Include="Controllers\CellWidthController.cs" />
    <Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
    <Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
    <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />