~yxj/MES-WEB-API.git

parent: 9799ffc3 | 补丁 | 提交 | ignore whitespace

王垚

2022-09-15 ef9a251d76d01e02965a4c14982008be6a78271d

nothing

4个文件已修改

	WarM/条码打印/Sc_ICMOToBarCode.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/CJGL/Cj_StationInBillController.cs	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/CJGL/ProductionPlanReportController.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web.config	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WarM/ÌõÂë´òÓ¡/Sc_ICMOToBarCode.cs

@@ -752,7 +752,6 @@

        private void cmdHSaveBill_Click(object sender, EventArgs e)
        {

            Display();
        }


 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -376,6 +376,47 @@
        }
        #endregion




        #region å·¥åºè¿ç«æ¥æ¶åæ ¹æ®èåä»£ç æ¨¡ç³åè½¦æ¥è¯¢
        [Route("Cj_StationInBill/GetMessageByEmpNumber")]
        [HttpGet]
        public object GetMessageByEmpNumber(string HEmpNumber)
        {
            try
            {
                //å¾å°ä¿¡æ¯
                ds = oCN.RunProcReturn("select top 1 * from gy_employee  where hnumber like '%" + HEmpNumber + "%'", "gy_employee");
                //åå¥ä¿¡æ¯
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æªæ¥è¯¢å°åºç«åæç»ä¿¡æ¯ï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucessï¼";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exceptionï¼" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


       

        #region è¿åå·¥åºè¿ç«æ¥æ¶ååè¡¨
        [Route("Cj_StationInBill/get_Display")]
        [HttpGet]

 WebAPI/Controllers/CJGL/ProductionPlanReportController.cs

@@ -27,7 +27,8 @@
            public DateTime HEndDate;
            public string HICMOBillNo;
            public string HWorkShopID;
            public string HSeOrderBillNo;
            public string F_BSV_WYID;
            public string HBillNo;
            public string HMaterNumber;
        }
        [Route("ProductionPlanReport/ProductionPlanReportList")]
@@ -40,7 +41,7 @@
                ProductionPlanReport com = JsonConvert.DeserializeObject<ProductionPlanReport>(sWhere.ToString());

                ds = oCN.RunProcReturn($"exec h_p_Cj_ProductionPlanReportList {com.HOrgID},'{com.HBeginDate}','{com.HEndDate}'" +
                    $",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.HSeOrderBillNo}','{com.HMaterNumber}'", "h_p_Cj_ProductionPlanReportList");
                    $",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.F_BSV_WYID}','{com.HMaterNumber}','{com.HBillNo}'", "h_p_Cj_ProductionPlanReportList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;

 WebAPI/Web.config

@@ -20,7 +20,7 @@
    <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
    <add key="FileIP" value="http://localhost:8080/" />
      <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
      <add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/>     <!--é¢å°å¼æº-->
      <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>     <!--é¢å°å¼æº-->
      <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
      <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
      <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åæ¥ç§æ-->
@@ -93,7 +93,7 @@
      </basicHttpBinding>
    </bindings>
    <client>
      <endpoint address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
      <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
        bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
        name="WebService1Soap" />
    </client>
@@ -101,7 +101,7 @@
  <applicationSettings>
    <WebAPI.Properties.Settings>
      <setting name="WebAPI_WebS_WebService1" serializeAs="String">
        <value>http://192.168.63.195/WEBS-WMS/WebService1.asmx</value>
        <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
      </setting>
    </WebAPI.Properties.Settings>
  </applicationSettings>

			@@ -752,7 +752,6 @@

			private void cmdHSaveBill_Click(object sender, EventArgs e)
			{

			Display();
			}

			@@ -376,6 +376,47 @@
			}
			#endregion




			#region å·¥åºè¿ç«æ¥æ¶åæ ¹æ®èåä»£ç æ¨¡ç³åè½¦æ¥è¯¢
			[Route("Cj_StationInBill/GetMessageByEmpNumber")]
			[HttpGet]
			public object GetMessageByEmpNumber(string HEmpNumber)
			{
			try
			{
			//å¾å°ä¿¡æ¯
			ds = oCN.RunProcReturn("select top 1 * from gy_employee where hnumber like '%" + HEmpNumber + "%'", "gy_employee");
			//åå¥ä¿¡æ¯
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æªæ¥è¯¢å°åºç«åæç»ä¿¡æ¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion




			#region è¿åå·¥åºè¿ç«æ¥æ¶ååè¡¨
			[Route("Cj_StationInBill/get_Display")]
			[HttpGet]

			@@ -27,7 +27,8 @@
			public DateTime HEndDate;
			public string HICMOBillNo;
			public string HWorkShopID;
			public string HSeOrderBillNo;
			public string F_BSV_WYID;
			public string HBillNo;
			public string HMaterNumber;
			}
			[Route("ProductionPlanReport/ProductionPlanReportList")]
			@@ -40,7 +41,7 @@
			ProductionPlanReport com = JsonConvert.DeserializeObject<ProductionPlanReport>(sWhere.ToString());

			ds = oCN.RunProcReturn($"exec h_p_Cj_ProductionPlanReportList {com.HOrgID},'{com.HBeginDate}','{com.HEndDate}'" +
			$",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.HSeOrderBillNo}','{com.HMaterNumber}'", "h_p_Cj_ProductionPlanReportList");
			$",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.F_BSV_WYID}','{com.HMaterNumber}','{com.HBillNo}'", "h_p_Cj_ProductionPlanReportList");

			objJsonResult.code = "1";
			objJsonResult.count = 1;

			@@ -20,7 +20,7 @@
			<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
			<add key="FileIP" value="http://localhost:8080/" />
			<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
			<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> <!--é¢å°å¼æº-->
			<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> <!--é¢å°å¼æº-->
			<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
			<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
			<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> åæ¥ç§æ-->
			@@ -93,7 +93,7 @@
			</basicHttpBinding>
			</bindings>
			<client>
			<endpoint address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
			<endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
			bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
			name="WebService1Soap" />
			</client>
			@@ -101,7 +101,7 @@
			<applicationSettings>
			<WebAPI.Properties.Settings>
			<setting name="WebAPI_WebS_WebService1" serializeAs="String">
			<value>http://192.168.63.195/WEBS-WMS/WebService1.asmx</value>
			<value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
			</setting>
			</WebAPI.Properties.Settings>
			</applicationSettings>