MES-WEB-API.git

parent: 2e4f5384 | 补丁 | 提交 | ignore whitespace

wtt

2024-08-01 55e565721ef588d7ae9f421b6d1fce63b51aa55f

物料流水号新增

2个文件已修改

	WebAPI/Controllers/BaseSet/Gy_MaterialController.cs	79 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -13,6 +13,7 @@
using System.Windows.Forms;
using WebAPI.Models;
using WebAPI.Service;
using System.Text.RegularExpressions;

namespace WebAPI.Controllers
{
@@ -114,6 +115,84 @@
            }
        }

        #region 物料根据分类获取最大物料编码
        [Route("Gy_Material/getMaxNum")]
        [HttpGet]
        public object getMaxNum(int HMaterTypeID, string user, string Organization)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HMaterTypeID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有选择具体分类！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    ds = oCN.RunProcReturn(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'" + "and HMaterTypeID = '"+ HMaterTypeID + "'" + " order by 物料代码 desc", "h_v_Gy_MaterialList");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "没有找到该分类的物料编码请使用普通新增";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    string HNumber = ds.Tables[0].Rows[0]["物料代码"].ToString();
                    // 使用正则表达式找到数字部分  (?<=\D)是一个零宽断言，表示前面的字符不是数字 (\d+)$表示后面跟着一连串字符串知道末尾
                    Match match = Regex.Match(HNumber, @"(?<=\D)(\d+)$");
                    if (match.Success)
                    {
                        string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // 提取前缀  
                        int number = int.Parse(match.Value); // 解析数字  
                        // 数字+1  
                        number++;
                        // 格式化数字，保持原长度  
                        string formattedNumber = number.ToString().PadLeft(match.Length, '0');
                        // 重新组合字符串  
                        string result = prefix + formattedNumber;

                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "success";
                        objJsonResult.data = result;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "此分类物料编码格式有误";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        /// <summary>
        /// 物料设置获取信息
        /// </summary>

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -23,12 +23,12 @@
    <File Include="bin/BLL.dll">
      <publishTime>11/09/2022 16:02:08</publishTime>
      <publishTime>11/02/2022 22:03:01</publishTime>
      <publishTime>08/01/2024 10:45:36</publishTime>
      <publishTime>08/01/2024 15:53:16</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/09/2022 16:02:08</publishTime>
      <publishTime>11/02/2022 22:03:01</publishTime>
      <publishTime>08/01/2024 10:45:36</publishTime>
      <publishTime>08/01/2024 15:53:16</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
@@ -36,12 +36,12 @@
    <File Include="bin/DAL.dll">
      <publishTime>11/09/2022 16:02:06</publishTime>
      <publishTime>11/02/2022 22:02:58</publishTime>
      <publishTime>08/01/2024 10:45:34</publishTime>
      <publishTime>08/01/2024 15:53:14</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/09/2022 16:02:06</publishTime>
      <publishTime>11/02/2022 22:02:58</publishTime>
      <publishTime>08/01/2024 10:45:34</publishTime>
      <publishTime>08/01/2024 15:53:14</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
@@ -49,12 +49,12 @@
    <File Include="bin/DBUtility.dll">
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>11/15/2022 13:55:23</publishTime>
      <publishTime>08/01/2024 10:45:30</publishTime>
      <publishTime>08/01/2024 15:53:09</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/09/2022 16:01:58</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>08/01/2024 10:45:30</publishTime>
      <publishTime>08/01/2024 15:53:09</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -110,12 +110,12 @@
    <File Include="bin/Model.dll">
      <publishTime>11/09/2022 16:02:01</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>08/01/2024 10:45:31</publishTime>
      <publishTime>08/01/2024 15:53:10</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/09/2022 16:02:01</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>08/01/2024 10:45:31</publishTime>
      <publishTime>08/01/2024 15:53:10</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -150,33 +150,33 @@
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/09/2022 16:01:56</publishTime>
      <publishTime>11/02/2022 22:02:54</publishTime>
      <publishTime>08/01/2024 10:45:29</publishTime>
      <publishTime>08/01/2024 15:53:08</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/09/2022 16:01:56</publishTime>
      <publishTime>11/02/2022 22:02:54</publishTime>
      <publishTime>08/01/2024 10:45:29</publishTime>
      <publishTime>08/01/2024 15:53:08</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>08/01/2024 10:45:29</publishTime>
      <publishTime>08/01/2024 15:53:08</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>08/01/2024 10:45:29</publishTime>
      <publishTime>08/01/2024 15:53:08</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/01/2024 10:45:30</publishTime>
      <publishTime>08/01/2024 15:53:09</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>08/01/2024 10:45:30</publishTime>
      <publishTime>08/01/2024 15:53:09</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -295,7 +295,7 @@
    <File Include="bin/WebAPI.dll">
      <publishTime>11/14/2022 11:23:59</publishTime>
      <publishTime>11/02/2022 22:03:04</publishTime>
      <publishTime>08/01/2024 10:45:42</publishTime>
      <publishTime>08/01/2024 15:53:22</publishTime>
    </File>
    <File Include="bin/WebAPI.dll.config">
      <publishTime>12/15/2021 17:59:43</publishTime>
@@ -303,7 +303,7 @@
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/14/2022 11:23:59</publishTime>
      <publishTime>11/02/2022 22:03:04</publishTime>
      <publishTime>08/01/2024 10:45:42</publishTime>
      <publishTime>08/01/2024 15:53:22</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -512,7 +512,7 @@
    <File Include="Web.config">
      <publishTime>11/14/2022 11:24:08</publishTime>
      <publishTime>11/02/2022 22:03:20</publishTime>
      <publishTime>08/01/2024 10:46:47</publishTime>
      <publishTime>08/01/2024 15:54:18</publishTime>
    </File>
  </ItemGroup>
</Project>

			@@ -13,6 +13,7 @@
			using System.Windows.Forms;
			using WebAPI.Models;
			using WebAPI.Service;
			using System.Text.RegularExpressions;

			namespace WebAPI.Controllers
			{
			@@ -114,6 +115,84 @@
			}
			}

			#region 物料根据分类获取最大物料编码
			[Route("Gy_Material/getMaxNum")]
			[HttpGet]
			public object getMaxNum(int HMaterTypeID, string user, string Organization)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HMaterTypeID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有选择具体分类！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			ds = oCN.RunProcReturn(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'" + "and HMaterTypeID = '"+ HMaterTypeID + "'" + " order by 物料代码 desc", "h_v_Gy_MaterialList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "没有找到该分类的物料编码请使用普通新增";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string HNumber = ds.Tables[0].Rows[0]["物料代码"].ToString();
			// 使用正则表达式找到数字部分 (?<=\D)是一个零宽断言，表示前面的字符不是数字 (\d+)$表示后面跟着一连串字符串知道末尾
			Match match = Regex.Match(HNumber, @"(?<=\D)(\d+)$");
			if (match.Success)
			{
			string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // 提取前缀
			int number = int.Parse(match.Value); // 解析数字
			// 数字+1
			number++;
			// 格式化数字，保持原长度
			string formattedNumber = number.ToString().PadLeft(match.Length, '0');
			// 重新组合字符串
			string result = prefix + formattedNumber;

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "success";
			objJsonResult.data = result;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "此分类物料编码格式有误";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion


			/// <summary>
			/// 物料设置获取信息
			/// </summary>

			@@ -23,12 +23,12 @@
			<File Include="bin/BLL.dll">
			<publishTime>11/09/2022 16:02:08</publishTime>
			<publishTime>11/02/2022 22:03:01</publishTime>
			<publishTime>08/01/2024 10:45:36</publishTime>
			<publishTime>08/01/2024 15:53:16</publishTime>
			</File>
			<File Include="bin/BLL.pdb">
			<publishTime>11/09/2022 16:02:08</publishTime>
			<publishTime>11/02/2022 22:03:01</publishTime>
			<publishTime>08/01/2024 10:45:36</publishTime>
			<publishTime>08/01/2024 15:53:16</publishTime>
			</File>
			<File Include="bin/BouncyCastle.Crypto.dll">
			<publishTime>12/18/2020 05:32:28</publishTime>
			@@ -36,12 +36,12 @@
			<File Include="bin/DAL.dll">
			<publishTime>11/09/2022 16:02:06</publishTime>
			<publishTime>11/02/2022 22:02:58</publishTime>
			<publishTime>08/01/2024 10:45:34</publishTime>
			<publishTime>08/01/2024 15:53:14</publishTime>
			</File>
			<File Include="bin/DAL.pdb">
			<publishTime>11/09/2022 16:02:06</publishTime>
			<publishTime>11/02/2022 22:02:58</publishTime>
			<publishTime>08/01/2024 10:45:34</publishTime>
			<publishTime>08/01/2024 15:53:14</publishTime>
			</File>
			<File Include="bin/Dapper.dll">
			<publishTime>07/22/2016 22:52:40</publishTime>
			@@ -49,12 +49,12 @@
			<File Include="bin/DBUtility.dll">
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>11/15/2022 13:55:23</publishTime>
			<publishTime>08/01/2024 10:45:30</publishTime>
			<publishTime>08/01/2024 15:53:09</publishTime>
			</File>
			<File Include="bin/DBUtility.pdb">
			<publishTime>11/09/2022 16:01:58</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>08/01/2024 10:45:30</publishTime>
			<publishTime>08/01/2024 15:53:09</publishTime>
			</File>
			<File Include="bin/Grpc.Core.Api.dll">
			<publishTime>03/22/2022 13:17:26</publishTime>
			@@ -110,12 +110,12 @@
			<File Include="bin/Model.dll">
			<publishTime>11/09/2022 16:02:01</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>08/01/2024 10:45:31</publishTime>
			<publishTime>08/01/2024 15:53:10</publishTime>
			</File>
			<File Include="bin/Model.pdb">
			<publishTime>11/09/2022 16:02:01</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>08/01/2024 10:45:31</publishTime>
			<publishTime>08/01/2024 15:53:10</publishTime>
			</File>
			<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
			<publishTime>04/15/2024 12:55:45</publishTime>
			@@ -150,33 +150,33 @@
			<File Include="bin/Pub_Class.dll">
			<publishTime>11/09/2022 16:01:56</publishTime>
			<publishTime>11/02/2022 22:02:54</publishTime>
			<publishTime>08/01/2024 10:45:29</publishTime>
			<publishTime>08/01/2024 15:53:08</publishTime>
			</File>
			<File Include="bin/Pub_Class.pdb">
			<publishTime>11/09/2022 16:01:56</publishTime>
			<publishTime>11/02/2022 22:02:54</publishTime>
			<publishTime>08/01/2024 10:45:29</publishTime>
			<publishTime>08/01/2024 15:53:08</publishTime>
			</File>
			<File Include="bin/Pub_Control.dll">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>08/01/2024 10:45:29</publishTime>
			<publishTime>08/01/2024 15:53:08</publishTime>
			</File>
			<File Include="bin/Pub_Control.pdb">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>08/01/2024 10:45:29</publishTime>
			<publishTime>08/01/2024 15:53:08</publishTime>
			</File>
			<File Include="bin/RestSharp.dll">
			<publishTime>08/31/2012 06:22:50</publishTime>
			</File>
			<File Include="bin/SQLHelper.dll">
			<publishTime>08/01/2024 10:45:30</publishTime>
			<publishTime>08/01/2024 15:53:09</publishTime>
			</File>
			<File Include="bin/SQLHelper.pdb">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>08/01/2024 10:45:30</publishTime>
			<publishTime>08/01/2024 15:53:09</publishTime>
			</File>
			<File Include="bin/stdole.dll">
			<publishTime>05/09/2021 13:35:37</publishTime>
			@@ -295,7 +295,7 @@
			<File Include="bin/WebAPI.dll">
			<publishTime>11/14/2022 11:23:59</publishTime>
			<publishTime>11/02/2022 22:03:04</publishTime>
			<publishTime>08/01/2024 10:45:42</publishTime>
			<publishTime>08/01/2024 15:53:22</publishTime>
			</File>
			<File Include="bin/WebAPI.dll.config">
			<publishTime>12/15/2021 17:59:43</publishTime>
			@@ -303,7 +303,7 @@
			<File Include="bin/WebAPI.pdb">
			<publishTime>11/14/2022 11:23:59</publishTime>
			<publishTime>11/02/2022 22:03:04</publishTime>
			<publishTime>08/01/2024 10:45:42</publishTime>
			<publishTime>08/01/2024 15:53:22</publishTime>
			</File>
			<File Include="bin/WebGrease.dll">
			<publishTime>07/18/2013 01:03:52</publishTime>
			@@ -512,7 +512,7 @@
			<File Include="Web.config">
			<publishTime>11/14/2022 11:24:08</publishTime>
			<publishTime>11/02/2022 22:03:20</publishTime>
			<publishTime>08/01/2024 10:46:47</publishTime>
			<publishTime>08/01/2024 15:54:18</publishTime>
			</File>
			</ItemGroup>
			</Project>