1

SGGL/WebAPI/Controllers/BaseInfoController.cs

@@ -1248,5 +1248,26 @@ namespace WebAPI.Controllers
             return responeData;
         }
         #endregion
+
+        #region 获取焊接位置
+        /// <summary>
+        ///   获取焊接位置
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getWeldingLocation()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = APIBaseInfoService.GetWeldingLocationList();
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
     }
 }

SGGL/WebAPI/Controllers/HJGL/WeldingManage/PreWeldingDailyController.cs

@@ -169,6 +169,38 @@ namespace WebAPI.Controllers
             }
             return responeData;
         }
+
+        /// <summary>
+        /// 根据焊口id保存到日报（增加焊接位置参数）
+        /// </summary>
+        /// <param name="WeldJointId"></param>
+        /// <param name="Personid"></param>
+        /// <param name="time"></param>
+        /// <param name="weldingLocation"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData SaveWeldingDailyByWeldJointId(string WeldJointId, string Personid, string time,string weldingLocation)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                string res = APIPreWeldingDailyService.SaveWeldingDailyByWeldJointId(WeldJointId, Personid, time, weldingLocation);
+
+                if (!string.IsNullOrEmpty(res))
+                {
+                    responeData.code = 0;
+                    responeData.message = res;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
         #endregion
 
         #region 更新焊接日报焊口信息