| WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/LMESController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Properties/PublishProfiles/JFAPI.pubxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Service/BaseSetService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Web.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/WebAPI.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
New file @@ -0,0 +1,73 @@ using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers { public class Gy_DepartmentController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; /// <summary> /// 返回部门列表 ///参数：string sql。 ///返回值：object。 /// </summary> [Route("Gy_Department/list")] [HttpGet] public object list(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList"); } else { string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "false！"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "1"; 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; } } // } } WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
New file @@ -0,0 +1,73 @@ using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers { public class Gy_ProcessController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; /// <summary> /// 返回工序列表 ///参数：string sql。 ///返回值：object。 /// </summary> [Route("Gy_Process/list")] [HttpGet] public object getProcessList(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList " + sWhere, "h_v_Gy_ProcessList"); } else { string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "false！"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "1"; 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; } } // } } WebAPI/Controllers/LMESController.cs
@@ -1101,7 +1101,38 @@ objJsonResult.data = e.ToString(); return objJsonResult; } } /// <summary> /// 返回工序列表 ///参数：string sql。 ///返回值：object。 /// </summary> [Route("LEMS/getProcessList")] [HttpGet] public object getProcessList(string sWhere) { DataSet ds; try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList "+ sWhere, "h_v_Gy_ProcessList"); } else { string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList"); } } catch (Exception e) { ds = null; } return GetObjectJson(ds); } // WebAPI/Properties/PublishProfiles/JFAPI.pubxml
New file @@ -0,0 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <!-- https://go.microsoft.com/fwlink/?LinkID=208121. --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <DeleteExistingFiles>True</DeleteExistingFiles> <ExcludeApp_Data>False</ExcludeApp_Data> <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> <LastUsedPlatform>x86</LastUsedPlatform> <PublishProvider>FileSystem</PublishProvider> <PublishUrl>F:\网站发布\江丰\JFAPI</PublishUrl> <WebPublishMethod>FileSystem</WebPublishMethod> <SiteUrlToLaunchAfterPublish /> </PropertyGroup> </Project> WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
New file @@ -0,0 +1,332 @@ <?xml version="1.0" encoding="utf-8"?> <!-- https://go.microsoft.com/fwlink/?LinkID=208121. --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>F:\网站发布\江丰\JFAPI</_PublishTargetUrl> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/18/2015 17:02:50</publishTime> </File> <File Include="bin/Microsoft.CSharp.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Microsoft.Web.Infrastructure.dll"> <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> </File> <File Include="bin/System.ComponentModel.DataAnnotations.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Configuration.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Data.DataSetExtensions.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Data.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Drawing.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.EnterpriseServices.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.IdentityModel.Tokens.Jwt.dll"> <publishTime>08/19/2014 10:03:34</publishTime> </File> <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> <publishTime>11/28/2018 13:00:36</publishTime> </File> <File Include="bin/System.Runtime.Serialization.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.ApplicationServices.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> <publishTime>11/28/2018 12:58:44</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.DynamicData.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Entity.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Extensions.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Helpers.dll"> <publishTime>01/28/2015 04:04:30</publishTime> </File> <File Include="bin/System.Web.Http.Cors.dll"> <publishTime>11/28/2018 13:01:26</publishTime> </File> <File Include="bin/System.Web.Http.dll"> <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> <publishTime>02/11/2014 15:26:04</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> <publishTime>01/28/2015 04:02:32</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.WebPages.Deployment.dll"> <publishTime>01/28/2015 04:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.dll"> <publishTime>01/28/2015 04:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.Razor.dll"> <publishTime>01/28/2015 04:04:30</publishTime> </File> <File Include="bin/System.Xml.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Xml.Linq.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>03/23/2021 16:26:42</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>03/23/2021 16:26:42</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>03/23/2021 14:35:51</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> <publishTime>11/29/2018 13:26:02</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> <publishTime>11/29/2018 13:26:30</publishTime> </File> <File Include="Content/bootstrap.css"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="Content/bootstrap.min.css"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="Content/Site.css"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="DLL/BLL.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="DLL/DAL.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="DLL/DBUtility.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="DLL/Model.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> <publishTime>03/23/2021 14:16:30</publishTime> </File> <File Include="DLL/Pub_Class.dll"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="DLL/Pub_Control.dll"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="DLL/SQLHelper.dll"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Global.asax"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Index.html"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="packages.config"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/web.config"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> <publishTime>03/23/2021 14:16:31</publishTime> </File> <File Include="Web.config"> <publishTime>03/23/2021 16:26:47</publishTime> </File> </ItemGroup> </Project> WebAPI/Service/BaseSetService.cs
New file @@ -0,0 +1,391 @@ using DBUtility; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Data; using System.Linq; using System.Text; using System.Web; using WebAPI.Dapper; using WebAPI.Models; using WebAPI.WebS; namespace WebAPI.Service { public class BaseSetService { /// <summary> /// 获取单据号 /// </summary> /// <returns></returns> public static ApiResult<DocumentsView> GetInterBillNo(string billType) { var hInterId = DBUtility.ClsPub.CreateBillID(billType, ref DBUtility.ClsPub.sExeReturnInfo); var hBillNo = DBUtility.ClsPub.CreateBillCode(billType, ref DBUtility.ClsPub.sExeReturnInfo, true); if (hInterId == 0 || string.IsNullOrEmpty(hBillNo)) return new ApiResult<DocumentsView> { code = -1, msg = "获取失败" }; DocumentsView documentsView = new DocumentsView() { HBillNo = hBillNo, HInterID = hInterId }; return new ApiResult<DocumentsView> { code = 1, msg = "获取成功", data = documentsView }; } /// <summary> /// 扫码方法 /// </summary> public static ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode) { if (string.IsNullOrEmpty(sBillBarCode)) return new ApiResult<DataSet> { code = -1, msg = "条码不能为空" }; sBillBarCode = sBillBarCode.CompareTo("#") > 0 ? sBillBarCode.Split(Convert.ToChar("#"))[0] : sBillBarCode; var dataSet = GetBarCodeDb(sBillBarCode); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "不存在流转卡号" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 流转卡回车方法 /// </summary> public static ApiResult<DataSet> GetProcDetail(string sBillNo, string sProcNo) { if (string.IsNullOrEmpty(sBillNo) || string.IsNullOrEmpty(sProcNo)) return new ApiResult<DataSet> { code = -1, msg = "条码和流转卡不能为空" }; var dataSet = GetProcDb(sBillNo, sProcNo); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "流水号或流转卡号为空" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 获取生产资源列表 /// </summary> public static ApiResult<DataSet> GetSourceList(string sWhere) { var dataSet = GetSourceDb(sWhere); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "未查询到生产资源" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 获取生产班组列表 /// </summary> public static ApiResult<DataSet> GetGroupList(string sWhere) { var dataSet = GetGroupDb(sWhere); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "未查询到生产班组" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 获取工作中心列表 /// </summary> public static ApiResult<DataSet> GetWorkCenterList(string sWhere) { var dataSet = GetGroupDb(sWhere); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "未查询到工作中心" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } private static ConcurrentDictionary<string, string> dicLock = new System.Collections.Concurrent.ConcurrentDictionary<string, string>();//并发锁 /// <summary> /// 进站接收单 /// </summary> public static ApiResult SetStationInBill(ClsSc_StationInBillMain oMain) { if (!dicLock.TryAdd(oMain.HICMOBillNo + "jz", ""))//防止并发 return new ApiResult { code = -1, msg = "服务器繁忙" }; try { if (oMain.HProcID == 0 || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HProcExchBillNo) || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HBillNo)) return new ApiResult { code = 1, msg = "参数不全" }; var stationInList = YqnDal.GetStationInBillMailList(oMain.HProcExchBillNo);//获得该流转卡所有进站单 if (stationInList.Count > 0) { var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HProcExchBillNo);//获得该流转卡所有出站单 var stationInModel = stationInList.OrderByDescending(a => a.HDate).First();//获取进站单最新进站工序 if (stationOutList.Count == 0 && oMain.HProcID == stationInModel.HProcID) return new ApiResult { code = -1, msg = "重复扫描" }; if (stationOutList.Count == 0 && oMain.HProcID != stationInModel.HProcID) return new ApiResult { code = -1, msg = "此单已关联" }; var stationOutModel = stationOutList.OrderByDescending(a => a.HDate).First();//获取出站单最新出站工序 if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HProcID == oMain.HProcID) return new ApiResult { code = -1, msg = "重复扫描" }; if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HProcID == oMain.HProcID) return new ApiResult { code = -1, msg = "此单已关联" }; if (stationOutList.Exists(a => a.HProcID == oMain.HProcID)) return new ApiResult { code = -1, msg = "该单据已完成此工艺" }; } WebS.WebService1 oWebs = new WebS.WebService1(); string sErrMsg = string.Empty; var result = oWebs.set_SaveStationInBill(oMain, ref sErrMsg);//进站 if (!result) { return new ApiResult { code = -1, msg = sErrMsg }; } return new ApiResult { code = 1, msg = "操作成功" }; } catch (Exception ex) { return new ApiResult { code = -1, msg = "请求错误" + ex.ToString() }; } finally { dicLock.TryRemove(oMain.HICMOBillNo + "jz", out string key); } } /// <summary> /// 获取进站单列表 /// </summary> /// <param name="sWhere"></param> /// <returns></returns> public static ApiResult<DataSet> GetStationInBillList(string sWhere) { var dataSet = GetStationInBill(sWhere); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "未查询到数据" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 获取出站单列表 /// </summary> /// <param name="sWhere"></param> /// <returns></returns> public static ApiResult<DataSet> GetStationOutBillList(string sWhere) { var dataSet = GetStationOutBill(sWhere); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "未查询到数据" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 获取流转卡列表 /// </summary> /// <param name="sWhere"></param> /// <returns></returns> public static ApiResult<DataSet> GetPorcessMainList(string sWhere) { var dataSet = GetProcessMain(sWhere); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "未查询到数据" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 获取流转卡子表列表 /// </summary> /// <param name="sWhere"></param> /// <returns></returns> public static ApiResult<DataSet> GetPorcessSubList(int hInterId) { var dataSet = GetProcessSubList(hInterId); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "未查询到数据" }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 出站接收单 /// </summary> public static ApiResult SetStationOutBill(StationOutBillView omodel) { if (!dicLock.TryAdd(omodel.HICMOBillNo + "cz", omodel.HBillNo))//同一单号并发处理 return new ApiResult { code = -1, msg = "服务器繁忙" }; try { var stationInBillModel = YqnDal.GetStationInBillMail(omodel.HProcID, omodel.HProcExchBillNo); if (stationInBillModel == null) return new ApiResult { code = -1, msg = "该工序进站单不存在" }; var stationOutBillModel = YqnDal.GetStationOutBillMail(omodel.HProcID, omodel.HProcExchBillNo); if (stationOutBillModel != null) return new ApiResult { code = -1, msg = "该工序已存在出站单" }; omodel.HYear = DateTime.Now.Year; var result = SetOutBill(omodel); return result; } catch (Exception ex) { return new ApiResult { code = -1, msg = ex.ToString() }; } finally { dicLock.TryRemove(omodel.HICMOBillNo + "cz", out string key); } } /// <summary> /// 获取工序详情 /// </summary> /// <param name="hItemId"></param> /// <returns></returns> public static ApiResult<Models.M_Process> GetProcessDetail(int hItemId) { var processModel = ProcessDal.GetProcessDetail(hItemId); if (processModel == null) return new ApiResult<M_Process> { code = -1, msg = "查询为空" }; processModel.DepartmentModel = ProcessDal.GetDepartmentModel(processModel.HDeptID); processModel.ProcMulModel = ProcessDal.GetProcMulModel(processModel.HProcMulID); return new ApiResult<M_Process> { code = 1, msg = "查询成功", data = processModel }; } /// <summary> /// 获取工序列表 /// </summary> /// <param name="hName"></param> /// <param name="hLevel"></param> /// <param name="hNumber"></param> /// <param name="hBillSubType"></param> /// <returns></returns> public static ApiResult<List<Models.M_Process>> GetProcessList(string hName, int hLevel, string hNumber, string hBillSubType, int page, int limit) { int pageCount = 0; var list = ProcessDal.GetProcessList(hName, hLevel, hNumber, hBillSubType, page, limit, ref pageCount); if (list?.Count == 0) return new ApiResult<List<M_Process>> { code = -1, msg = "查询为空" }; return new ApiResult<List<M_Process>> { code = 0, msg = "查询成功", data = list, count = pageCount }; } /// <summary> /// 删除一条工序 /// </summary> /// <param name="hItemID"></param> /// <returns></returns> public static ApiResult DeleteProcess(int hItemID) { var result = ProcessDal.DeleteProcess(hItemID); if (result > 0) return new ApiResult { code = 1, msg = "删除成功" }; return new ApiResult { code = -1, msg = "删除数据不存在" }; } #region sql语句 public static DataSet GetStationOutBill(string strWhere) { var sql = "Select top 5000 * from h_v_MES_StationOutBillList Where 1=1 " + strWhere; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList"); return dataSet; } public static DataSet GetStationInBill(string strWhere) { var sql = "Select top 5000 * from h_v_MES_StationInBillList Where 1=1 " + strWhere; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList"); return dataSet; } public static DataSet GetProcessSubList(int hInterId) { var sql = "select a.HProcNo 流水号,a.HProcNumber as 工序代码,b.HName 工序名称,c.HName 工作中心,a.HQty 流转卡数量 from Sc_ProcessExchangeBillSub a left join Gy_Process b on b.HItemID = a.HProcID left join Gy_WorkCenter c on c.HItemID = a.HCenterID where 1=1 and a.HInterID=" + hInterId; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn(sql, "Sc_ProcessExchangeBillSub"); return dataSet; } public static DataSet GetProcessMain(string strWhere) { var sql = "select a.HBillNo 单据号, a.HDate 日期, HInterID, a.HICMOBillNo 生产订单, b.HName 产品名称, b.HNumber 产品代码, a.HPlanQty 流转卡数量, c.HName 单位, a.HPlanBeginDate 计划开工日期, a.HPlanEndDate 计划完工日期, a.HRemark 备注" + " from Sc_ProcessExchangeBillMain a left join Gy_Material b on a.HMaterID = b.HItemID left join Gy_Unit c on c.HItemID = a.HUnitID where 1=1 " + strWhere; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn(sql, "Sc_ProcessExchangeBillMain"); return dataSet; } public static DataSet GetBarCodeDb(string billBarCode) { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 单据号= '" + billBarCode + "'", "h_v_Sc_ProcessExchangeBillList"); return dataSet; } public static DataSet GetSourceDb(string sWhere) { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 生产资源代码,HName 生产资源 from Gy_Source where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source"); return dataSet; } public static DataSet GetGroupDb(string sWhere) { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 工作中心代码,HName 工作中心 from Gy_WorkCenter where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source"); return dataSet; } public static DataSet GetProcDb(string sBillNo, string sProcNo) { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 单据号= '" + sBillNo + "' and 工序号='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList"); return dataSet; } /// <summary> /// 工作中心 /// </summary> /// <param name="sWhere"></param> /// <returns></returns> public static DataSet GetWorkCenterDb(string sWhere) { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 工作中心代码,HName 工作中心 from Gy_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source"); return dataSet; } public static ApiResult SetOutBill(StationOutBillView omodel) { try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo); oCN.BeginTran(); var sql = "Insert Into Sc_StationOutBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + ",HYear,HPeriod,HRemark" + ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" + ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID" + ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" + ",HSupID,HQty,HPrice,HMoney,HProcNo" + ") " + " values('3791','3791'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" + "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() + "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" + "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() + "," + omodel.HProcNo + ") "; //var result= SqlPools.GetInstance("YqnConn").ExecuteCommand(sql); oCN.RunProc(sql); oCN.Commit(); return new ApiResult { code = 1, msg = "新增成功" }; } catch (Exception ex) { return new ApiResult { code = -1, msg = "保存错误/" + ex.ToString() }; } } public static ApiResult SetInBill(ClsSc_StationInBillMain omodel) { //SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); try { var nowTime = DateTime.Now; omodel.HBillType = "3790"; omodel.HYear = nowTime.Year; omodel.HBillSubType = "3790"; //得到mainid omodel.HInterID = DBUtility.ClsPub.CreateBillID(omodel.HBillType, ref DBUtility.ClsPub.sExeReturnInfo); omodel.HDate = nowTime; omodel.HMakeDate = nowTime.ToString(); omodel.HStationInTime = nowTime; omodel.HBarCodeMakeDate = nowTime; omodel.HPeriod = 1; var sqlBuilder = new StringBuilder(); sqlBuilder.Append("Insert Into Sc_StationInBillMain(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HYear,HPeriod,HRemark,HICMOInterID,HICMOBillNo"); sqlBuilder.Append(",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID"); sqlBuilder.Append(",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSupID,HQty,HPrice,HMoney,HProcId,HProcNo) values "); sqlBuilder.Append("(@HBillType,@HBillSubType,@HInterID,@HBillNo,@HBillStatus,@HDate,@HMaker,@HMakeDate,@HYear,@HPeriod,@HRemark,@HICMOInterID,@HICMOBillNo"); sqlBuilder.Append(",@HProcPlanInterID,@HProcPlanEntryID,@HProcPlanBillNo,@HProcExchInterID,@HProcExchEntryID,@HProcExchBillNo,@HMaterID,@HProcID,@HICMOQty,@HPlanQty,@HStationInTime,@HSourceID"); sqlBuilder.Append(",@HGroupID,@HDeptID,@HEmpID,@HBarCode,@HAddr,@HBarCodeMaker,@HBarCodeMakeDate,@HSupID,@HQty,@HPrice,@HMoney,@HProcId,@HProcNo)"); //若MAINDI重复则重新获取 //oCN.BeginTran(); var result = SqlPools.GetInstance("YqnConn").ExecuteCommand(sqlBuilder.ToString(), omodel); //oCN.RunProc(sql); //oCN.Commit(); return new ApiResult { code = 1, msg = "新增成功" }; } catch (Exception e) { //oCN.RollBack(); return new ApiResult { code = -1, msg = "保存错误/" + e.ToString() }; } } #endregion } } WebAPI/Web.config
@@ -11,8 +11,8 @@ </configSections> <connectionStrings> <!--<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />--> <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys;Integrated Security=True" /> <!--<add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys_Simoer;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />--> <add name="YqnConn" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HX_LMESsys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" /> </connectionStrings> <appSettings> WebAPI/WebAPI.csproj
@@ -232,6 +232,7 @@ <Content Include="Index.html" /> <Content Include="Views\Scripts\bootstrap.js" /> <Content Include="Views\Scripts\bootstrap.min.js" /> <None Include="Properties\PublishProfiles\JFAPI.pubxml" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> @@ -314,6 +315,8 @@ <Compile Include="App_Start\RouteConfig.cs" /> <Compile Include="App_Start\SwaggerConfig.cs" /> <Compile Include="App_Start\WebApiConfig.cs" /> <Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" /> <Compile Include="Controllers\BaseSet\Gy_ProcessController.cs" /> <Compile Include="Controllers\LMESController.cs" /> <Compile Include="Controllers\LookingForBillController.cs" /> <Compile Include="Controllers\NewApiController.cs" /> @@ -341,6 +344,7 @@ </Compile> <Compile Include="Service\ProcessDal.cs" /> <Compile Include="Service\YqnDal.cs" /> <Compile Include="Service\BaseSetService.cs" /> <Compile Include="Service\YqnQbService.cs" /> <Compile Include="Web References\WebS\Reference.cs"> <AutoGen>True</AutoGen> WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@ <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected> <WebStackScaffolding_LayoutPageFile /> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>WEBAPI</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>JFAPI</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress />
