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/Develop/YunTongJackYunTask into YanShi

Browse Source 
# Conflicts:
#	Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
This commit is contained in:
liqionghai
2025-08-24 13:07:09 +08:00
parent 160447703b fa17cd7e02
commit 91a6d99251
51 changed files with 2542 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Reportapi/MyCode.Project.Repositories/App.config
View File

@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" />
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

18
Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
View File

@@ -10,6 +10,7 @@ using MyCode.Project.Domain.Repositories;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Infrastructure.Search;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
using MyCode.Project.Domain.Message.Act.Common;
namespace MyCode.Project.Repositories
{
@@ -23,12 +24,19 @@ namespace MyCode.Project.Repositories
{
SearchCondition where = new SearchCondition();
where.AddSqlCondition(" 1=1 ", true);
where.AddSqlCondition("a.FDOCUMENTSTATUS='C' ", true);
string sql = $@" SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID FROM T_SAL_ORDER A WITH(NOLOCK)
LEFT JOIN T_BD_CUSTOMER Cccc WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID
LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 ";
string sql = $@"
SELECT * ,(FQTY-FStockOutQty) AS FRemainOutQty,OutboundPercentage=CONVERT(DECIMAL(18,2),(CASE WHEN FQTY !=0 THEN FStockOutQty/FQTY*1.00 ELSE 0 END))
FROM (
SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID
,(SELECT SUM(FStockOutQty) FROM T_SAL_ORDERENTRY_R g WHERE g.FID=a.FID) AS FStockOutQty
,(SELECT SUM(g.FQTY) FROM T_SAL_ORDERENTRY g WHERE g.FID=a.FID) AS FQTY
FROM T_SAL_ORDER A WITH(NOLOCK)
LEFT JOIN T_BD_CUSTOMER Cccc WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID
LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052
WHERE a.FDOCUMENTSTATUS='C') a ";
var list = this.SelectListPage<SalOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc ");

111
Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs Normal file
View File

@@ -0,0 +1,111 @@
using MyCode.Project.Domain.Message;
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
using MyCode.Project.Domain.Model;
using MyCode.Project.Domain.Repositories;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Infrastructure.Search;
using MyCode.Project.Repositories.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Repositories
{
public class MOOrdersRepository : Repository<JackOrders>, IMOOrdersRepository
{
public MOOrdersRepository(MyCodeSqlSugarClient context) : base(context)
{ }
/// <summary>
/// 查询生产订单表体
/// </summary>
/// <param name="search"></param>
/// <returns></returns>
public PageResult<PrdMoOrderEntryResp> GetPrdMoEntryPageList(PagedSearch<IdAct> search)
{
SearchCondition where = new SearchCondition();
where.AddSqlCondition($"t1e.FID={search.Condition.Id} ", true);
string sql = $@"
SELECT
t1e.FSEQ Seq,
tm_l.FNAME MaterialName,
t2_l.FNAME DeptName,
t1e.FQTY Qty,
t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY InStockQty,
CASE
WHEN t1e_a.FSTATUS = 1 THEN '计划'
WHEN t1e_a.FSTATUS = 2 THEN '计划确认'
WHEN t1e_a.FSTATUS = 3 THEN '下达'
WHEN t1e_a.FSTATUS = 4 THEN '开工'
WHEN t1e_a.FSTATUS = 5 THEN '完工'
WHEN t1e_a.FSTATUS = 6 THEN '结案'
WHEN t1e_a.FSTATUS = 7 THEN '结算'
ELSE ''
END MoStatus
FROM
T_PRD_MOENTRY t1e
LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID
LEFT JOIN T_BD_MATERIAL tm ON t1e.FMATERIALID = tm.FMATERIALID
LEFT JOIN T_BD_MATERIAL_L tm_l ON tm_l.FMATERIALID = tm.FMATERIALID
AND tm_l.FLOCALEID = 2052
LEFT JOIN T_BD_DEPARTMENT t2 ON t1e.FWORKSHOPID = t2.FDEPTID
LEFT JOIN T_BD_DEPARTMENT_L t2_l ON t2.FDEPTID = t2_l.FDEPTID
AND t2_l.FLOCALEID = 2052
";
var list = this.SelectListPage<PrdMoOrderEntryResp>(sql, where, search.Page, search.PageSize, $@"SEQ desc ");
return list;
}
/// <summary>
/// 查询生产订单表头
/// </summary>
/// <param name="search"></param>
/// <returns></returns>
public PageResult<PrdMoOrderResp> GetPrdMoPageList(PagedSearch search)
{
SearchCondition where = new SearchCondition();
where.AddSqlCondition("1=1 ", true);
string sql = $@"
SELECT
*
FROM
(
SELECT
t1.FID Fid,
t1.FBILLNO FBillNo,
t1.FDATE FDate,
SUM(t1e.FQTY) Qty,
SUM(
t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY
) InStockQty
FROM
T_PRD_MO t1
LEFT JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID
LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID
WHERE
1 = 1
AND t1.FDOCUMENTSTATUS = 'C'
GROUP BY
t1.FID,
t1.FBILLNO,
t1.FDATE
) t1Temp
";
var list = this.SelectListPage<PrdMoOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc ");
return list;
}
}
}

3
Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Repositories</RootNamespace>
<AssemblyName>MyCode.Project.Repositories</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
@@ -86,6 +86,7 @@
<Compile Include="Common\Repository`.cs" />
<Compile Include="Common\TransactionCallHandler.cs" />
<Compile Include="Common\TransactionCallHandlerAttribute.cs" />
<Compile Include="MOOrdersRepository.cs" />
<Compile Include="JackOrdersRepository.cs" />
<Compile Include="Lxm\LxmReportRepository.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />