Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'YanShi' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into YanShi

Browse Source
This commit is contained in:
余宇波 2025-09-02 14:59:16 +08:00
commit fdf1d59f3e
11 changed files with 415 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Reportapi/MyCode.Project.Domain/Message/Act/AdminReport/PrdReport/YearAndMonth.cs Normal file
View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Domain.Message.Act.AdminReport.PrdReport
{
public class YearAndMonth
{
public int Year { get; set; }
public int Month { get; set; }
}
}

17
Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/MaterialAndQty.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
{
public class MaterialAndQty
{
public string MaterialMasterId { get; set; }
public string MaterialNumber { get; set; }
public string MaterialName { get; set; }
public decimal Qty { get; set; }
}
}

18
Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdReportHead.cs Normal file
View File

@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
{
public class PrdReportHead
{
public decimal YearPrdQty { get; set; }
public decimal YearInStockQty { get; set; }
public decimal MonthPrdQty { get; set; }
public decimal MonthInStockQty { get; set; }
public decimal StockQty { get; set; }
public DateTime dateTime { get; set; }
}
}

7
Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
View File

@ -56,6 +56,7 @@
<ItemGroup>
<Compile Include="Config\K3CloudConfig.cs" />
<Compile Include="Config\SystemConfig.cs" />
<Compile Include="Message\Act\AdminReport\PrdReport\YearAndMonth.cs" />
<Compile Include="Message\Act\Common\AnsyReportExportAct.cs" />
<Compile Include="Message\Act\Common\ChangeStatusAct.cs" />
<Compile Include="Message\Act\Common\IdAct.cs" />
@ -76,9 +77,11 @@
<Compile Include="Message\Response\K3Cloud\Model\K3CloudResult.cs" />
<Compile Include="Message\Response\K3Cloud\Model\K3CloudResultInfo.cs" />
<Compile Include="Message\Response\K3Cloud\Model\K3CloudSuccessEntity.cs" />
<Compile Include="Message\Response\LxmZHMDReport\MaterialAndQty.cs" />
<Compile Include="Message\Response\LxmZHMDReport\PrdMOExecuteDetailRpt.cs" />
<Compile Include="Message\Response\LxmZHMDReport\PrdMoOrderEntryResp.cs" />
<Compile Include="Message\Response\LxmZHMDReport\PrdMoOrderResp.cs" />
<Compile Include="Message\Response\LxmZHMDReport\PrdReportHead.cs" />
<Compile Include="Message\Response\LxmZHMDReport\ReportCalRateResp.cs" />
<Compile Include="Message\Response\LxmZHMDReport\SalOrderResp.cs" />
<Compile Include="Message\Response\PurOrder\PurOrderMainResp.cs" />
@ -125,9 +128,7 @@
<Name>MyCode.Project.Infrastructure</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Message\Act\AdminReport\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

5
Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs
View File

@ -1,5 +1,6 @@
using MyCode.Project.Domain;
using MyCode.Project.Domain.Message;
using MyCode.Project.Domain.Message.Act.AdminReport.PrdReport;
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
using MyCode.Project.Domain.Model;
@ -31,5 +32,9 @@ namespace MyCode.Project.Domain.Repositories
/// <param name="search"></param>
/// <returns></returns>
PageResult<PrdMoOrderEntryResp> GetPrdMoEntryPageList(PagedSearch<IdAct> search);
PrdReportHead GetMoDataChartHeadByYearAndMonth(YearAndMonth yearAndMonth);
List<MaterialAndQty> GetPrdInStockGroupByMaterial(YearAndMonth yearAndMonth);
List<MaterialAndQty> GetPrdMoGroupByMaterial(YearAndMonth yearAndMonth);
List<MaterialAndQty> GetInventoryGroupByMaterial();
}
}

162
Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs
View File

@ -1,4 +1,5 @@
using MyCode.Project.Domain.Message;
using MyCode.Project.Domain.Message.Act.AdminReport.PrdReport;
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
using MyCode.Project.Domain.Model;
@ -72,7 +73,6 @@ FROM
{
SearchCondition where = new SearchCondition();
where.AddSqlCondition("1=1 ", true);
string sql = $@"
SELECT
*
@ -106,6 +106,166 @@ FROM
return list;
}
/// <summary>
/// 获取看板头数据
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
public PrdReportHead GetMoDataChartHeadByYearAndMonth(YearAndMonth yearAndMonth)
{
var yearStartDate = new DateTime(yearAndMonth.Year, 1, 1);
var yearEndDate = yearStartDate.AddYears(1);
var monthStartDate = new DateTime(yearAndMonth.Year, yearAndMonth.Month, 1);
var monthEndDate = monthStartDate.AddMonths(1);
string sql = $@"
SELECT
(
SELECT
SUM(t1e.FQTY) YearPrdQty
FROM
T_PRD_MO t1
INNER JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID
WHERE
1 = 1
AND t1.FDATE >= {yearStartDate.ToString("yyyy-MM-dd")}
AND t1.FDATE < {yearEndDate.ToString("yyyy-MM-dd")}
AND t1.FDOCUMENTSTATUS = 'C'
) YearPrdQty,
(
SELECT
SUM(t1e.FQTY) MonthPrdQty
FROM
T_PRD_MO t1
INNER JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID
WHERE
1 = 1
AND t1.FDATE >= {monthStartDate.ToString("yyyy-MM-dd")}
AND t1.FDATE < {monthEndDate.ToString("yyyy-MM-dd")}
AND t1.FDOCUMENTSTATUS = 'C'
) MonthPrdQty,
(
SELECT
SUM(t1e.FREALQTY) InStockQty
FROM
T_PRD_INSTOCK t1
INNER JOIN T_PRD_INSTOCKENTRY t1e ON t1.FID = t1e.FID
WHERE
1 = 1
AND t1.FDATE >= {yearStartDate.ToString("yyyy-MM-dd")}
AND t1.FDATE < {yearEndDate.ToString("yyyy-MM-dd")}
AND t1.FDOCUMENTSTATUS = 'C'
) YearInStockQty,
(
SELECT
SUM(t1e.FREALQTY) InStockQty
FROM
T_PRD_INSTOCK t1
INNER JOIN T_PRD_INSTOCKENTRY t1e ON t1.FID = t1e.FID
WHERE
1 = 1
AND t1.FDATE >= {monthStartDate.ToString("yyyy-MM-dd")}
AND t1.FDATE < {monthEndDate.ToString("yyyy-MM-dd")}
AND t1.FDOCUMENTSTATUS = 'C'
) MonthPrdQty,
(
SELECT
SUM(t1.FQTY) StockQty
FROM
T_STK_INVENTORY t1
) StockQty
";
var result = this.SelectFirst<PrdReportHead>(sql);
result.dateTime = monthEndDate.AddDays(-1);
return result;
}
public List<MaterialAndQty> GetPrdInStockGroupByMaterial(YearAndMonth yearAndMonth)
{
var yearStartDate = new DateTime(yearAndMonth.Year, 1, 1);
var yearEndDate = yearStartDate.AddYears(1);
var monthStartDate = new DateTime(yearAndMonth.Year, yearAndMonth.Month, 1);
var monthEndDate = monthStartDate.AddMonths(1);
var sql = $@"
SELECT
tm.FMASTERID MaterialMasterId,
tm.FNUMBER MaterialNumber,
tm_l.FNAME MaterialName,
SUM(t1e.FREALQTY) Qty
FROM
T_PRD_INSTOCK t1
INNER JOIN T_PRD_INSTOCKENTRY t1e ON t1.FID = t1e.FID
INNER JOIN T_BD_MATERIAL tm ON t1e.FMATERIALID = tm.FMATERIALID
LEFT JOIN T_BD_MATERIAL_L tm_l ON tm.FMATERIALID = tm_l.FMATERIALID
AND tm_l.FLOCALEID = 2052
WHERE
1 = 1
AND t1.FDATE >= {yearStartDate.ToString("yyyy-MM-dd")}
AND t1.FDATE < {yearEndDate.ToString("yyyy-MM-dd")}
AND t1.FDOCUMENTSTATUS = 'C'
GROUP BY
tm.FMASTERID,
tm.FNUMBER,
tm_l.FNAME
";
var result = this.SelectList<MaterialAndQty>(sql);
return result;
}
public List<MaterialAndQty> GetPrdMoGroupByMaterial(YearAndMonth yearAndMonth)
{
var yearStartDate = new DateTime(yearAndMonth.Year, 1, 1);
var yearEndDate = yearStartDate.AddYears(1);
var monthStartDate = new DateTime(yearAndMonth.Year, yearAndMonth.Month, 1);
var monthEndDate = monthStartDate.AddMonths(1);
var sql = $@"
SELECT
tm.FMASTERID MaterialMasterId,
tm.FNUMBER MaterialNumber,
tm_l.FNAME MaterialName,
SUM(t1e.FQTY) Qty
FROM
T_PRD_MO t1
INNER JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID
INNER JOIN T_BD_MATERIAL tm ON t1e.FMATERIALID = tm.FMATERIALID
LEFT JOIN T_BD_MATERIAL_L tm_l ON tm.FMATERIALID = tm_l.FMATERIALID
AND tm_l.FLOCALEID = 2052
WHERE
1 = 1
AND t1.FDATE >= {yearStartDate.ToString("yyyy-MM-dd")}
AND t1.FDATE < {yearEndDate.ToString("yyyy-MM-dd")}
AND t1.FDOCUMENTSTATUS = 'C'
GROUP BY
tm.FMASTERID,
tm.FNUMBER,
tm_l.FNAME
";
var result = this.SelectList<MaterialAndQty>(sql);
return result;
}
public List<MaterialAndQty> GetInventoryGroupByMaterial()
{
var sql = $@"
SELECT
tm.FMASTERID MaterialMasterId,
tm.FNUMBER MaterialNumber,
tm_l.FNAME MaterialName,
SUM(t1e.FQTY) Qty
FROM
T_STK_INVENTORY t1e
INNER JOIN T_BD_MATERIAL tm ON t1e.FMATERIALID = tm.FMATERIALID
LEFT JOIN T_BD_MATERIAL_L tm_l ON tm.FMATERIALID = tm_l.FMATERIALID
AND tm_l.FLOCALEID = 2052
WHERE
1 = 1
GROUP BY
tm.FMASTERID,
tm.FNUMBER,
tm_l.FNAME
";
var result = this.SelectList<MaterialAndQty>(sql);
return result;
}
}
}

21
Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs
View File

@ -1,7 +1,9 @@
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Act.AdminReport.PrdReport;
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Infrastructure.JackYun;
using System.Collections.Generic;
namespace MyCode.Project.Services
{
@ -27,5 +29,22 @@ namespace MyCode.Project.Services
/// <param name="search"></param>
/// <returns></returns>
PageResult<PrdMOExecuteDetailRpt> GetMoExecuteSumRespData(PagedSearch search);
/// <summary>
/// 获取报表头
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
PrdReportHead GetMoDataChartHeadByYearAndMonth(YearAndMonth yearAndMonth);
/// <summary>
/// 获取看板折现图
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
List<PrdReportHead> GetMoDataChartByYearAndMonth(YearAndMonth yearAndMonth);
List<MaterialAndQty> GetPrdInStockGroupByMaterial(YearAndMonth yearAndMonth);
List<MaterialAndQty> GetPrdMoGroupByMaterial(YearAndMonth yearAndMonth);
List<MaterialAndQty> GetInventoryGroupByMaterial();
}
}

54
Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs
View File

@ -1,4 +1,5 @@
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Act.AdminReport.PrdReport;
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Request.JackYun;
using MyCode.Project.Domain.Message.Request.K3Cloud;
using MyCode.Project.Domain.Message.Response.K3Cloud;
@ -115,5 +116,56 @@ namespace MyCode.Project.Services.Implementation
}
/// <summary>
/// 获取报表头
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
public PrdReportHead GetMoDataChartHeadByYearAndMonth(YearAndMonth yearAndMonth)
{
return _MOOrdersRepository.GetMoDataChartHeadByYearAndMonth(yearAndMonth);
}
/// <summary>
/// 获取报表折线图,获取往期12个月的数据
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public List<PrdReportHead> GetMoDataChartByYearAndMonth(YearAndMonth yearAndMonth)
{
List<PrdReportHead> result = new List<PrdReportHead>();
var datetime = new DateTime(yearAndMonth.Year, yearAndMonth.Month, 1);
for (int i = 0; i < 12; i++)
{
var datetimeTemp = datetime.AddMonths(-i);
YearAndMonth yearAndMonthTemp = new YearAndMonth()
{
Year = datetimeTemp.Year,
Month = datetimeTemp.Month,
};
result.Add(_MOOrdersRepository.GetMoDataChartHeadByYearAndMonth(yearAndMonth));
}
return result;
}
public List<MaterialAndQty> GetPrdInStockGroupByMaterial(YearAndMonth yearAndMonth)
{
return _MOOrdersRepository.GetPrdInStockGroupByMaterial(yearAndMonth);
}
public List<MaterialAndQty> GetPrdMoGroupByMaterial(YearAndMonth yearAndMonth)
{
return _MOOrdersRepository.GetPrdMoGroupByMaterial(yearAndMonth);
}
public List<MaterialAndQty> GetInventoryGroupByMaterial()
{
return _MOOrdersRepository.GetInventoryGroupByMaterial();
}
}
}

31
Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs
View File

@ -82,35 +82,6 @@ namespace MyCode.Project.WebApi.Areas.Admin.Controllers
return _PurOrderService.GetPurDetil(search);
}
/// <summary>
/// 获取生产订单
/// </summary>
[AllowAnonymous]
[HttpPost]
public PageResult<PrdMoOrderResp> GetMoRespData(PagedSearch pagedSearch)
{
return _prdOrderService.GetPrdMoPageList(pagedSearch);
}
/// <summary>
/// 获取生产订单详情
/// </summary>
[AllowAnonymous]
[HttpPost]
public PageResult<PrdMoOrderEntryResp> GetMoEntryRespData(PagedSearch<IdAct> search)
{
return _prdOrderService.GetPrdMoEntryPageList(search);
}
/// <summary>
/// 获取生产订单执行汇总报表数据
/// </summary>
[AllowAnonymous]
[HttpPost]
public PageResult<PrdMOExecuteDetailRpt> GetMoExecuteSumRespData(PagedSearch pagedSearch)
{
return _prdOrderService.GetMoExecuteSumRespData(pagedSearch);
}
}
}

120
Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/PrdDataChartController.cs Normal file
View File

@ -0,0 +1,120 @@
using MyCode.Project.Domain.Message.Act.AdminReport.PrdReport;
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
namespace MyCode.Project.WebApi.Areas.Admin.Controllers
{
/// <summary>
/// 生产看板控制器
/// </summary>
public class PrdDataChartController : BaseAdminController
{
private IPrdOrderService _prdOrderService;
/// <summary>
/// 生产订单服务
/// </summary>
/// <param name="prdOrderService"></param>
public PrdDataChartController(IPrdOrderService prdOrderService)
{
_prdOrderService = prdOrderService;
}
/// <summary>
/// 获取生产订单
/// </summary>
[AllowAnonymous]
[HttpPost]
public PageResult<PrdMoOrderResp> GetMoRespData(PagedSearch pagedSearch)
{
return _prdOrderService.GetPrdMoPageList(pagedSearch);
}
/// <summary>
/// 获取生产订单详情
/// </summary>
[AllowAnonymous]
[HttpPost]
public PageResult<PrdMoOrderEntryResp> GetMoEntryRespData(PagedSearch<IdAct> search)
{
return _prdOrderService.GetPrdMoEntryPageList(search);
}
/// <summary>
/// 获取生产订单执行汇总报表数据
/// </summary>
[AllowAnonymous]
[HttpPost]
public PageResult<PrdMOExecuteDetailRpt> GetMoExecuteSumRespData(PagedSearch pagedSearch)
{
return _prdOrderService.GetMoExecuteSumRespData(pagedSearch);
}
/// <summary>
/// 获取生产看板头数据
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
public PrdReportHead GetMoDataChartHeadByYearAndMonth(YearAndMonth yearAndMonth)
{
return _prdOrderService.GetMoDataChartHeadByYearAndMonth(yearAndMonth);
}
/// <summary>
/// 获取生产看板折线数据
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
public List<PrdReportHead> GetMoDataChartByYearAndMonth(YearAndMonth yearAndMonth)
{
return _prdOrderService.GetMoDataChartByYearAndMonth(yearAndMonth);
}
/// <summary>
/// 获取生产入库数据，主要用作饼图，展示各物料生产入库数量（完工数量）
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
public List<MaterialAndQty> GetPrdInStockGroupByMaterial(YearAndMonth yearAndMonth)
{
return _prdOrderService.GetPrdInStockGroupByMaterial(yearAndMonth);
}
/// <summary>
/// 获取生产订单数据，主要用作饼图，展示各物料生产订单数量（生产数量）
/// </summary>
/// <param name="yearAndMonth"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
public List<MaterialAndQty> GetPrdMoGroupByMaterial(YearAndMonth yearAndMonth)
{
return _prdOrderService.GetPrdMoGroupByMaterial(yearAndMonth);
}
/// <summary>
/// 获取即时库存数据，主要用作饼图，展示各物料库存数量（库存数量）
/// </summary>
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
public List<MaterialAndQty> GetInventoryGroupByMaterial()
{
return _prdOrderService.GetInventoryGroupByMaterial();
}
}
}

2
Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
View File

@ -204,6 +204,7 @@
<Compile Include="Areas\Admin\Controllers\BaseAdminController.cs" />
<Compile Include="Areas\Admin\Controllers\DataChartController.cs" />
<Compile Include="Areas\Admin\Controllers\LxmZHMDReportController.cs" />
<Compile Include="Areas\Admin\Controllers\PrdDataChartController.cs" />
<Compile Include="Areas\Extensions.cs" />
<Compile Include="Areas\Wechat\Controllers\BaseWechatController.cs" />
<Compile Include="Areas\Wechat\Controllers\ReportController.cs" />
@ -1674,6 +1675,7 @@
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="App_File\download\exceltemp\" />
<Folder Include="Areas\Admin\Views\PrdDataChart\" />
<Folder Include="Configs\" />
<Folder Include="uploadfiles\" />
</ItemGroup>