Skip to content

F
FTT_Board
Commit 652b912c authored by 王奇誉's avatar 王奇誉
Browse files
Options

Merge branch 'master' of http://192.168.1.181/root/FTT_Board

parents b98e537c 53adf543
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 65 deletions
FTT.Board/FTT.Board.Api/Controllers/API/FactoryBoardSopController.cs
View file @ 652b912c
......@@ -19,64 +19,56 @@ namespace FTT.Board.Controllers.API
/// </summary>
public ModuleModel ModuleName => ModuleModel.PDM;
/// <summary>
/// 模糊搜索列表
/// 根据款式号返回列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public string GetSearchList([FromBody]GetSearchListRequest request)
[HttpGet]
public string GetStyleCodeList(string StyleCode, int PageIndex, int PageSize)
{
DataTable dataTable = Dbo.Create(this.ModuleName).GetDataTable($@"
SELECT DISTINCT * FROM (
SELECT a.StyleCode FROM dbo.MES_StyleProcess a
if (PageIndex < 1) PageIndex = 1;
if (PageSize < 1) PageSize = 20;
DataSet dataSet = Dbo.Create(this.ModuleName).GetDataSet($@"
SELECT DISTINCT * into #Temp FROM (
SELECT a.StyleCode,b.Name AS CustomStyleCode,c.CustomName FROM dbo.MES_StyleProcess a
INNER JOIN dbo.SM_Style b ON a.StyleCode=b.Code
INNER JOIN V_PDM_SmStyle_GroupbyCode V ON B.ID=V.id
INNER JOIN dbo.Custom c ON b.CustomID = c.ID WHERE a.WorkSectionID=800
UNION
SELECT b.Code AS StyleCode FROM SM_SampleIE a
INNER JOIN dbo.SM_Style b ON b.Code = a.StyleCode
SELECT b.Code AS StyleCode,b.Name AS CustomStyleCode,c.CustomName FROM SM_SampleIE a
INNER JOIN dbo.SM_Style b ON a.StyleCode=b.Code
INNER JOIN V_PDM_SmStyle_GroupbyCode V ON B.ID=V.id
INNER JOIN dbo.Custom c ON b.CustomID = c.ID WHERE a.WorkSectionID<>800
) a WHERE a.StyleCode LIKE '%{request.SearchText}%'
", true);
) a
JsonSerializerSettings jsSettings = new JsonSerializerSettings();
jsSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
return JsonConvert.SerializeObject(Table2Model.ToModelList<GetStyleCodeListRequest>(dataTable), jsSettings).ToString();
}
SELECT * FROM #Temp WHERE StyleCode LIKE '%{StyleCode}%'
Order by StyleCode asc OFFSET ({PageIndex} - 1) * {PageSize} rows fetch next {PageSize} rows only
/// <summary>
/// 根据款式号返回列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public string GetStyleCodeList([FromBody]GetStyleCodeListRequest request)
{
DataTable dataTable = Dbo.Create(this.ModuleName).GetDataTable("[SP_APP_StyleIEDefend]", new
{
SearchText = request.StyleCode,
Flag = 0
}, true);
SELECT COUNT(*) FROM #Temp");
GetStyleCodeListResponse model = new GetStyleCodeListResponse();
model.StyleCodeInfos = Table2Model.ToModelList<StyleCodeInfo>(dataSet.Tables[0]);
model.Total = int.Parse(dataSet.Tables[1].Rows[0][0].ToString());
JsonSerializerSettings jsSettings = new JsonSerializerSettings();
jsSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
return JsonConvert.SerializeObject(Table2Model.ToModelList<GetStyleCodeListResponse>(dataTable), jsSettings).ToString();
return JsonConvert.SerializeObject(model, jsSettings).ToString();
}
/// <summary>
/// IE详情
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public string GetIEStyleInfo([FromBody]GetIEStyleInfoRepuest request)
[HttpGet]
public string GetIEStyleInfo(string StyleCode, int WorkSectionID)
{
DataSet dataSet = Dbo.Create(this.ModuleName).GetDataSet("[SP_APP_StyleIEDefend]", new
{
WorkSectionID = request.WorkSectionID,
StyleCode = request.StyleCode,
WorkSectionID = WorkSectionID,
StyleCode = StyleCode,
Flag = 1
}, true);
......@@ -84,6 +76,21 @@ namespace FTT.Board.Controllers.API
model = Table2Model.ToModel<GetIEStyleInfoResponse>(dataSet.Tables[0]);
model.IEDetails = Table2Model.ToModelList<IEDetail>(dataSet.Tables[1]);
string strUrl = dataSet.Tables[4].Rows[0][0].ToString();
model.IEDetails.ForEach(item =>
{
item.IEPictures = new List<string>();
if (!string.IsNullOrEmpty(item.IEPicture)) item.IEPictures.Add(strUrl + item.IEPicture);
if (!string.IsNullOrEmpty(item.IEPicture1)) item.IEPictures.Add(strUrl + item.IEPicture1);
if (!string.IsNullOrEmpty(item.IEPicture2)) item.IEPictures.Add(strUrl + item.IEPicture2);
if (!string.IsNullOrEmpty(item.IEPicture3)) item.IEPictures.Add(strUrl + item.IEPicture3);
if (!string.IsNullOrEmpty(item.IEPicture4)) item.IEPictures.Add(strUrl + item.IEPicture4);
if (item.PartName != null && item.PartName.Contains("原材料-"))
item.PartName = item.PartName.Replace("原材料-", "");
});
JsonSerializerSettings jsSettings = new JsonSerializerSettings();
jsSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
......@@ -91,18 +98,6 @@ namespace FTT.Board.Controllers.API
}
/// <summary>
/// 模糊搜索列表
/// </summary>
public class GetSearchListRequest
{
/// <summary>
/// 搜索字段
/// </summary>
public string SearchText { get; set; }
}
/// <summary>
/// 根据款式号返回列表
/// </summary>
......@@ -120,26 +115,17 @@ namespace FTT.Board.Controllers.API
public class GetStyleCodeListResponse
{
/// <summary>
/// 款式号
/// 总页数
/// </summary>
public string StyleCode { get; set; }
public int Total { get; set; }
/// <summary>
/// 客户货号
/// 货号列表
/// </summary>
public string CustomStyleCode { get; set; }
/// <summary>
/// 客户名
/// </summary>
public string CustomName { get; set; }
public List<StyleCodeInfo> StyleCodeInfos { get; set; }
}
/// <summary>
/// 获取IE明细
/// </summary>
public class GetIEStyleInfoRepuest
public class StyleCodeInfo
{
/// <summary>
/// 款式号
......@@ -147,9 +133,14 @@ namespace FTT.Board.Controllers.API
public string StyleCode { get; set; }
/// <summary>
/// 工段 800裁断,801针车,802成型
/// 客户货号
/// </summary>
public int WorkSectionID { get; set; }
public string CustomStyleCode { get; set; }
/// <summary>
/// 客户名
/// </summary>
public string CustomName { get; set; }
}
/// <summary>
......@@ -268,6 +259,11 @@ namespace FTT.Board.Controllers.API
/// 图片4
/// </summary>
public string IEPicture4 { get; set; }
/// <summary>
/// 图片数组
/// </summary>
public List<string> IEPictures { get; set; }
}
}
}
FTT.Board/FTT.Board.Api/FTT.Board.csproj.user
View file @ 652b912c
......@@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
......
FTT.Board/FTT.Board.Api/Properties/PublishProfiles/FolderProfile.pubxml.user
View file @ 652b912c
......@@ -94,7 +94,7 @@
<publishTime>04/17/2019 16:25:52</publishTime>
</File>
<File Include="bin/FTT.Board.dll">
<publishTime>09/24/2020 16:38:31</publishTime>
<publishTime>09/29/2020 10:33:51</publishTime>
</File>
<File Include="bin/FTT.Board.EF.dll">
<publishTime>09/24/2020 16:38:31</publishTime>
......@@ -106,7 +106,7 @@
<publishTime>09/24/2020 16:38:31</publishTime>
</File>
<File Include="bin/FTT.Board.pdb">
<publishTime>09/24/2020 16:38:31</publishTime>
<publishTime>09/29/2020 10:33:51</publishTime>
</File>
<File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
<publishTime>05/14/2020 15:56:15</publishTime>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment