This commit is contained in:
PastSaid
2024-03-11 14:47:23 +08:00
parent 6dd1816c96
commit 08d8878eef
202 changed files with 274 additions and 246 deletions

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{DE8419DB-4979-4AF6-830D-73F6B793CC31}</ProjectGuid>
<ProjectGuid>{F76F54B5-3DF1-486C-A632-2CF188A0F9AD}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AllOperation</RootNamespace>

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C672A706-DEAE-4541-AD5A-DCB8938FA4D1}</ProjectGuid>
<ProjectGuid>{956A86C4-3938-4373-980B-D96B880ED333}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ProductionMaterialRequisition</RootNamespace>

View File

@@ -5,7 +5,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6EE96AB5-8FD3-4A48-912A-CA2AF5B82300}</ProjectGuid>
<ProjectGuid>{F2051AA0-9F9E-4EF7-A10E-385055793291}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UnitTestProject1</RootNamespace>
@@ -40,13 +40,13 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Kingdee.BOS">
<HintPath>..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.dll</HintPath>
<HintPath>..\..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.App">
<HintPath>..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.App.dll</HintPath>
<HintPath>..\..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.App.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Core">
<HintPath>..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.Core.dll</HintPath>
<HintPath>..\..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.Core.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.ServiceFacade.KDServiceClient">
<HintPath>..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.ServiceFacade.KDServiceClient.dll</HintPath>
@@ -83,20 +83,6 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Extensions\ExtensionMethods.csproj">
<Project>{50532462-8f7f-455c-b4b3-732ed764e2fa}</Project>
<Name>ExtensionMethods</Name>
</ProjectReference>
<ProjectReference Include="..\HandleUtils\HandleUtils.csproj">
<Project>{A386E924-0477-49BF-A3DD-82390EDF75C7}</Project>
<Name>HandleUtils</Name>
</ProjectReference>
<ProjectReference Include="..\K3CExttensionMethods\K3CExttensionMethods.csproj">
<Project>{825dd90b-2a8d-4884-9940-6da56ef6623f}</Project>
<Name>K3CExttensionMethods</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

View File

@@ -13,7 +13,6 @@ using System.Text;
using System.Web;
using Kingdee.BOS.Authentication;
using Kingdee.BOS.App.Data;
using Kingdee.BOS.Business.PlugIn.MainConsole.HomePageHtml;
using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
using Kingdee.BOS.DataEntity;
@@ -109,10 +108,6 @@ namespace Kingdee.BOS.Test.PlugIn.Basic
public override void AfterCreateNewData(EventArgs e)
{
base.AfterCreateNewData(e);
if ()
{
}
}
}
}

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{50532462-8F7F-455C-B4B3-732ED764E2FA}</ProjectGuid>
<ProjectGuid>{BEAE0BF6-7AB9-4AF5-83CE-D08E3C6880EF}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ExtensionMethods</RootNamespace>

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A386E924-0477-49BF-A3DD-82390EDF75C7}</ProjectGuid>
<ProjectGuid>{D6A5E5A0-7529-4FFA-9F9D-B2C610919BF6}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HandleUtils</RootNamespace>

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{825DD90B-2A8D-4884-9940-6DA56EF6623F}</ProjectGuid>
<ProjectGuid>{6D24872E-8FAA-4CE6-9542-1EB0DB405A7A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>K3CExttensionMethods</RootNamespace>

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{12B329E1-C4F2-4CA7-BF3E-313F22AD527A}</ProjectGuid>
<ProjectGuid>{C07EB866-7BC7-43C4-B1C1-271E985C55CC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SAL_OUTSTOCK</RootNamespace>
@@ -78,8 +78,8 @@
<Content Include="SQLServer\销售出库单财务信息-视图.sql" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Extensions\ExtensionMethods.csproj">
<Project>{50532462-8f7f-455c-b4b3-732ed764e2fa}</Project>
<ProjectReference Include="..\..\01.扩展\Extensions\ExtensionMethods.csproj">
<Project>{beae0bf6-7ab9-4af5-83ce-d08e3c6880ef}</Project>
<Name>ExtensionMethods</Name>
</ProjectReference>
</ItemGroup>

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2E8D2379-C8CB-47E1-BF89-A11111F18A08}</ProjectGuid>
<ProjectGuid>{C7AACA24-410B-4497-8400-EAF0A81C2133}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UnPayableInStock</RootNamespace>

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4D6BDA2D-FED0-4514-B4CD-FF32C5389247}</ProjectGuid>
<ProjectGuid>{7014B4E2-94AC-430F-BD20-72BA2BA6EBA3}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UseGetFmaterialData</RootNamespace>
@@ -61,8 +61,8 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Extensions\ExtensionMethods.csproj">
<Project>{50532462-8f7f-455c-b4b3-732ed764e2fa}</Project>
<ProjectReference Include="..\..\01.扩展\Extensions\ExtensionMethods.csproj">
<Project>{beae0bf6-7ab9-4af5-83ce-d08e3c6880ef}</Project>
<Name>ExtensionMethods</Name>
</ProjectReference>
</ItemGroup>

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>71c43a75-6d5c-49d0-8698-dc30b7990e73</ProjectGuid>
<ProjectGuid>{63fa856a-e38d-4464-a164-11eed1dfe0f8}</ProjectGuid>
<ProjectHome>.</ProjectHome>
<StartupFile>HW.PRD_MO.Python.py</StartupFile>
<SearchPath>..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin</SearchPath>
@@ -29,6 +29,10 @@
<AssemblyName>Accessibility.dll</AssemblyName>
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\Accessibility.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<Name>mscorlib</Name>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="SQLServer\" />

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6B01804E-3777-4AFF-A841-A4114BED02B8}</ProjectGuid>
<ProjectGuid>{3134279E-5C1B-421C-9E2D-5013D599FA53}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HW.PRD_MO</RootNamespace>

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A65B2F53-286E-4C0F-91DA-601F257314C1}</ProjectGuid>
<ProjectGuid>{89236B39-F2B6-4757-AB69-DF89FDBCE3A5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HW.ProductionMateralsPlugIn</RootNamespace>

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>61f8ab34-1280-4dbe-9826-778330c2b2b6</ProjectGuid>
<ProjectGuid>{615361a4-2f0e-4521-a8c5-46bdb8aa6f28}</ProjectGuid>
<ProjectHome>.</ProjectHome>
<StartupFile>
</StartupFile>

View File

@@ -88,8 +88,13 @@ def BuilderReportSqlAndTempTable(rptfilter,tableName):
if _saleOrderNo != "":
whereSql = whereSql + " AND t0e.FSALEORDERNO = '{0}'".format(_saleOrderNo);
_F_ora_SDate = objEx.ToSafeString(custFilter["F_ora_SDate"])
_FSStock = ""
_stockSelectCollection = custFilter["FStockSelect"]
if _stockSelectCollection != None and _stockSelectCollection.Count > 0:
idList = set(map(lambda x : str(x["FStockSelect_Id"]), _stockSelectCollection))
_FSStock = " AND FSTOCKID IN ({0}) ".format(",".join(idList))
_F_ora_SDate = objEx.ToSafeString(custFilter["F_ora_SDate"])
_F_ora_EDate = objEx.ToSafeString(custFilter["F_ora_EDate"])
if whereSql == "":
@@ -158,8 +163,9 @@ Create Table #tmpStockID (
,FStockID INT
)
DECLARE @Strsql varchar(max)
SET @Strsql= 'INSERT INTO #tmpStockID SELECT DISTINCT FSTOCKID FROM T_BD_STOCK WHERE 1=1 ' +@FSStock
EXEC(@Strsql)
--SET @Strsql= 'INSERT INTO #tmpStockID SELECT DISTINCT FSTOCKID FROM T_BD_STOCK WHERE 1=1 ' +@FSStock
--EXEC(@Strsql)
INSERT INTO #tmpStockID SELECT DISTINCT FSTOCKID FROM T_BD_STOCK WHERE 1=1 {5}
--库存状态报表
@@ -3270,7 +3276,7 @@ DROP TABLE #tmpSUBBOM2
DROP TABLE #tmpSUBBOM3
DROP TABLE #Stock_Status_temp
SET nocount off
""").format(tableName,_lcId,whereSql,_F_ora_SDate,_F_ora_EDate);
""").format(tableName,_lcId,whereSql,_F_ora_SDate,_F_ora_EDate,_FSStock);
# raise Exception(sql);#可以通过此方法弹出Sql语句进行调试验证
DBUtils.Execute(this.Context,sql);#执行SQL将报表数据写入临时表
@@ -3347,6 +3353,8 @@ def GetReportTitles(rptfilter):
_saleOrderNo = objEx.ToSafeString(custFilter["SALEORDERNO"]);
_F_ora_SDate = objEx.ToSafeString(custFilter["F_ora_SDate"])
_F_ora_EDate = objEx.ToSafeString(custFilter["F_ora_EDate"])
# 仓库
_stockSelectCollection = custFilter["FStockSelect"]
if(_proMaterialId != None):
reportTitles.AddTitle("FTitleProMaterialId", _proMaterialId["Name"]);
# if(_materialId != None):
@@ -3362,6 +3370,11 @@ def GetReportTitles(rptfilter):
if(_F_ora_EDate != ""):
reportTitles.AddTitle("F_ora_EDate", _F_ora_EDate);
if _stockSelectCollection != None and _stockSelectCollection.Count > 0:
nameList = list(map(lambda x : str(x["FStockSelect"]["Name"]), _stockSelectCollection))
_stockNames = ",".join(nameList)
reportTitles.AddTitle("FStockSelect" ,_stockNames)
return reportTitles;
#报表关闭触发,通常在此处清理报表过程产生的临时表

View File

@@ -8,6 +8,7 @@ clr.AddReference("Kingdee.BOS.ServiceHelper")
from Kingdee.BOS import *
from Kingdee.BOS.Core import *
from Kingdee.BOS.Core.Bill import *
from Kingdee.BOS.Core.List import *
from Kingdee.BOS.Core.Report import *
from System import *
from System.Data import *
@@ -17,6 +18,11 @@ from Kingdee.BOS.App.Data import *
from Kingdee.BOS.Core.List.PlugIn import *
from Kingdee.BOS.Core.List.PlugIn.Args import *
# def FormatCellValue(args):
# # ÈÕÆÚ¸ñʽ»¯
# if args.Header.ColType == SqlStorageType.SqlDatetime:
# args.FormateValue = ("{0}").format(DateTime.Parse(str(args.FormateValue)).ToString("yyyy-MM-dd"))
def CellDbClick(e):
e.Cancel = True
fldKey = e.Header.FieldName;
@@ -24,15 +30,15 @@ def CellDbClick(e):
if fldKey == "FBASENEEDQTY":
reportModel = this.Model
tab = reportModel.DataSource
row = e.CellRowIndex
_moId = value=("{0}").format(tab.Rows[row-1]["MOIDS"]);
if _moId != None and str(_moId) != "" and str(_moId) != "0":
ShowForm("PRD_MO", _moId)
row = e.CellRowIndex - 1
data = tab.Rows[row]
filterStr = "FID IN ({0}) AND FMATERIALID = {1} ".format(data["MOIDS"],data["FProMaterialId"])
ShowListForm("PRD_MO", filterStr)
def ShowForm(_fromId, _pkVal, _operationStatus = OperationStatus.VIEW ,_openStyleShowType = ShowType.Floating):
showParam = BillShowParameter();
def ShowListForm(_fromId, _filter, _operationStatus = OperationStatus.VIEW ,_openStyleShowType = ShowType.Floating):
showParam = ListShowParameter();
showParam.FormId = _fromId;
showParam.ParentPageId = this.View.PageId;
showParam.OpenStyle.ShowType = _openStyleShowType;
showParam.Status = _operationStatus;
showParam.PKey = _pkVal;
showParam.ListFilterParameter.Filter = _filter
this.View.ShowForm(showParam)

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{01F02D15-2726-4077-80FC-9E38EF29BABC}</ProjectGuid>
<ProjectGuid>{6AA65F8D-BA02-4CA7-85FB-551A1D7C1143}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HW.App.Sal.Report.PlugInEx</RootNamespace>

View File

@@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{49AF92F2-2DCF-42F4-AB29-12298575D803}</ProjectGuid>
<ProjectGuid>{17EF8474-392A-4595-A4D4-D224F16AF8C4}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HW.ProductionMaterialsReport</RootNamespace>
@@ -81,12 +81,16 @@
<Content Include="SqlServer\获取单据状态.sql" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Extensions\ExtensionMethods.csproj">
<Project>{50532462-8f7f-455c-b4b3-732ed764e2fa}</Project>
<ProjectReference Include="..\..\01.扩展\Extensions\ExtensionMethods.csproj">
<Project>{beae0bf6-7ab9-4af5-83ce-d08e3c6880ef}</Project>
<Name>ExtensionMethods</Name>
</ProjectReference>
<ProjectReference Include="..\K3CExttensionMethods\K3CExttensionMethods.csproj">
<Project>{825DD90B-2A8D-4884-9940-6DA56EF6623F}</Project>
<ProjectReference Include="..\..\01.扩展\HandleUtils\HandleUtils.csproj">
<Project>{d6a5e5a0-7529-4ffa-9f9d-b2c610919bf6}</Project>
<Name>HandleUtils</Name>
</ProjectReference>
<ProjectReference Include="..\..\01.扩展\K3CExttensionMethods\K3CExttensionMethods.csproj">
<Project>{6d24872e-8faa-4ce6-9542-1eb0db405a7a}</Project>
<Name>K3CExttensionMethods</Name>
</ProjectReference>
</ItemGroup>

View File

@@ -15,6 +15,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
@@ -131,7 +132,15 @@ namespace ProductionMaterialsReport
{
new ListHeader("FDATE", new LocaleValue("单据日期"))
});
header.AddChild("FDATE", new LocaleValue("单据日期"), _colIndex++).SetHeader(x => { x.Mergeable = true;x.ColType = SqlStorageType.SqlDecimal;});
Func<string, string, int, Action<ListHeader>, ListHeader> memberLambda = (fieldName, value, colIndex, action) => new ListHeader(fieldName, new LocaleValue(value)).SetHeader(action);
var list = new List<ListHeader>
{
memberLambda("FDATE", "单据日期", _colIndex++, x => { x.Mergeable = true;x.ColType = SqlStorageType.SqlDecimal;})
};
header.AddRange(list);
header.AddChild("FDATE", new LocaleValue("单据日期"), _colIndex++).SetHeader(x => { x.Mergeable = true; x.ColType = SqlStorageType.SqlDecimal; });
header.AddChild("FPPBOMBILLNO", new LocaleValue("生产投料单号"), _colIndex++).SetHeader(x => { x.Mergeable = true; });
header.AddChild("FSALEORDERNO", new LocaleValue("销售订单号"), _colIndex++).SetHeader(x => { x.Mergeable = true; });
header.AddChild("SaleUnitId", new LocaleValue("购货单位代码"), _colIndex++);

Some files were not shown because too many files have changed in this diff Show More