MES接口添加超时时间

SIMDP/SIMDP.BLL/BlProductTask.cs

@@ -266,7 +266,7 @@ namespace SIMDP.BLL
                 {
                     //serial num
                     //taskstate
-                    model.SerialNum = Convert.ToInt32(model.ID >= 10000 ? (model.ID / 10000 + 10000) : (model.ID + 10000));
+                    model.SerialNum = Convert.ToInt32(model.ID >= 10000 ? (model.ID % 10000 + 10000) : (model.ID + 10000));
                     model.FinalNum = model.SerialNum.ToString() + "_" + model.Date.ToString("yyMMdd");
                     model.LargeState = model.LargeState > 1 ? model.LargeState : 1;
                     bool res02 = dalProductTask.Update(model, model.ID);

SIMDP/SIMDP.Project/RWS/ExternalInterface.cs

@@ -42,6 +42,7 @@ namespace SIMDP.Project
                 inPara.station = workStaion;
                 RWS2MESService.RoboticToMesInterfaceImplService roboticToMesInterfaceImplService = new RWS2MESService.RoboticToMesInterfaceImplService();
                 roboticToMesInterfaceImplService.Url = "http://172.30.156.163:8080/uma-unimax-web/ws/robotic?wsdl";
+                roboticToMesInterfaceImplService.Timeout = 700000;
                 sresult = roboticToMesInterfaceImplService.receivingCuttingRequest(JsonConvert.SerializeObject(inPara).Replace("\\u0000", ""));
                 AutoCallRequest.outPara outPara = JsonConvert.DeserializeObject<AutoCallRequest.outPara>(sresult);
                 //LogHelper.log.Debug($"转运接口调用：inPara = {JsonConvert.SerializeObject(inPara)}, outPara = {sresult}");
@@ -76,6 +77,7 @@ namespace SIMDP.Project
                 inPara.station = workStaion;
                 RWS2MESService.RoboticToMesInterfaceImplService roboticToMesInterfaceImplService = new RWS2MESService.RoboticToMesInterfaceImplService();
                 roboticToMesInterfaceImplService.Url = "http://172.30.156.163:8080/uma-unimax-web/ws/robotic?wsdl";
+                roboticToMesInterfaceImplService.Timeout = 700000;
                 sresult = roboticToMesInterfaceImplService.receivingCuttingRequest(JsonConvert.SerializeObject(inPara).Replace("\\u0000", ""));
                 AutoCallRequest.outPara outPara = JsonConvert.DeserializeObject<AutoCallRequest.outPara>(sresult);
                 sresult = outPara.ResultType + ":" + outPara.ResultMessage;