MES-WEB-API.git

parent: 8ecf62e4 | 补丁 | 提交 | ignore whitespace

llj

2026-02-09 c3002b25fab3381a4b18163bcb4774bb07ace7d4

7个文件已修改

	Model/obj/Release/Model.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/obj/x86/Release/Model.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/BaseSet/Gy_MaterialController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/条码管理/WEBSController.cs	172 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/Reference.cs	8749 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/WebService1.wsdl	3822 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/WebAPI.csproj.user	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/x86/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -4834,7 +4834,7 @@
                        "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
                        "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
                        ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
                        ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + " ) ");
                        ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "' ) ");
                    }
                    else
                    {

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -4696,6 +4696,66 @@

        #endregion

        #region çäº§éåº    ä¸ä¼ çå

        #region çäº§éåº    æ ¡éªæ¨¡å¼

        /// <summary>
        /// çäº§éåºæ ¡éªä¸ä¼ 
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/set_SaveProductInBackBill_BillCheck_Json")]
        [HttpPost]
        public object set_SaveProductInBackBill_BillCheck_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();

            try
            {
                List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getICStockBillMainByJson(msg1);

                WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();

                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HBillType = "1245";
                websLsmain.HMaker = lsmain[0].HMaker;
                websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

                if (oWebs.set_SaveProductInBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //æåï¼
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //å¤±è´¥ï¼
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "çäº§éåºæ ¡éªå¤±è´¥ï¼" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #endregion

        #region éè´éæ    ä¸ä¼ çå

        #region éè´éæ    æ°å¢æ¨¡å¼
@@ -4777,6 +4837,62 @@
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "éè´éæåä¸ä¼ å¤±è´¥ï¼" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region éè´éæ    æ ¡éªæ¨¡å¼

        /// <summary>
        /// éè´éææ ¡éªä¸ä¼ 
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/set_SavePOStockInBackBill_BillCheck_Json")]
        [HttpPost]
        public object set_SavePOStockInBackBill_BillCheck_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();

            try
            {
                List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getICStockBillMainByJson(msg1);

                WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();

                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HBillType = "1239";
                websLsmain.HMaker = lsmain[0].HMaker;
                websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

                if (oWebs.set_SavePOStockInBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //æåï¼
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //å¤±è´¥ï¼
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "éè´éææ ¡éªå¤±è´¥ï¼" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -5012,6 +5128,62 @@

        #endregion

        #region éå®éè´§    æ ¡éªæ¨¡å¼

        /// <summary>
        /// éå®éè´§æ ¡éªä¸ä¼ 
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/set_SaveSellOutBackBill_BillCheck_Json")]
        [HttpPost]
        public object set_SaveSellOutBackBill_BillCheck_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();

            try
            {
                List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getICStockBillMainByJson(msg1);

                WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();

                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HBillType = "1247";
                websLsmain.HMaker = lsmain[0].HMaker;
                websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

                if (oWebs.set_SaveSellOutBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //æåï¼
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //å¤±è´¥ï¼
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "éå®éè´§æ ¡éªå¤±è´¥ï¼" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #endregion

        #region å§å¤éæ    ä¸ä¼ çå

 WebAPI/Web References/WebS/Reference.cs

Diff too large

 WebAPI/Web References/WebS/WebService1.wsdl

Diff too large

 WebAPI/WebAPI.csproj.user

@@ -1,6 +1,7 @@
ï»¿<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
@@ -9,12 +10,9 @@
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
<<<<<<< HEAD
    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
=======
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
>>>>>>> 8deaa1b9ce935bab8fbad806f3c13e8cb405771e
    <ProjectView>ShowAllFiles</ProjectView>
  </PropertyGroup>
  <ProjectExtensions>

			@@ -4834,7 +4834,7 @@
			"," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
			"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
			",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
			",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + " ) ");
			",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "' ) ");
			}
			else
			{

			@@ -4696,6 +4696,66 @@

			#endregion

			#region çäº§éåº ä¸ä¼ çå

			#region çäº§éåº æ ¡éªæ¨¡å¼

			/// <summary>
			/// çäº§éåºæ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveProductInBackBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveProductInBackBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getICStockBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1245";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveProductInBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çäº§éåºæ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			#region éè´éæ ä¸ä¼ çå

			#region éè´éæ æ°å¢æ¨¡å¼
			@@ -4777,6 +4837,62 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "éè´éæåä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region éè´éæ æ ¡éªæ¨¡å¼

			/// <summary>
			/// éè´éææ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SavePOStockInBackBill_BillCheck_Json")]
			[HttpPost]
			public object set_SavePOStockInBackBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getICStockBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1239";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SavePOStockInBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "éè´éææ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -5012,6 +5128,62 @@

			#endregion

			#region éå®éè´§ æ ¡éªæ¨¡å¼

			/// <summary>
			/// éå®éè´§æ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveSellOutBackBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveSellOutBackBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getICStockBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1247";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveSellOutBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "éå®éè´§æ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			#region å§å¤éæ ä¸ä¼ çå

			@@ -1,6 +1,7 @@
			ï»¿<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<LastActiveSolutionConfig>Debug\|x86</LastActiveSolutionConfig>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			@@ -9,12 +10,9 @@
			<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
			<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
			<UseGlobalApplicationHostFile />
			<<<<<<< HEAD
			<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
			=======
			<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
			>>>>>>> 8deaa1b9ce935bab8fbad806f3c13e8cb405771e
			<ProjectView>ShowAllFiles</ProjectView>
			</PropertyGroup>
			<ProjectExtensions>