diff --git a/00.未分类/AllOperation/AllEventDynamicFormPlugIn.cs b/00.未分类/AllOperation/AllEventDynamicFormPlugIn.cs index 206ad31..4c10427 100644 --- a/00.未分类/AllOperation/AllEventDynamicFormPlugIn.cs +++ b/00.未分类/AllOperation/AllEventDynamicFormPlugIn.cs @@ -578,4 +578,4 @@ namespace Jac.XkDemo.BOS.Business.PlugIn } #endregion } -} +} \ No newline at end of file diff --git a/00.未分类/UnitTestProject2/Properties/AssemblyInfo.cs b/00.未分类/UnitTestProject2/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..30b998c --- /dev/null +++ b/00.未分类/UnitTestProject2/Properties/AssemblyInfo.cs @@ -0,0 +1,20 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("UnitTestProject2")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("UnitTestProject2")] +[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: ComVisible(false)] + +[assembly: Guid("3f9daefd-d6af-4fa8-b6b2-485832ab9b26")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/00.未分类/UnitTestProject2/UnitTest1.cs b/00.未分类/UnitTestProject2/UnitTest1.cs new file mode 100644 index 0000000..d275b9e --- /dev/null +++ b/00.未分类/UnitTestProject2/UnitTest1.cs @@ -0,0 +1,32 @@ +using Kingdee.BOS.Orm.DataEntity; +using Kingdee.BOS.Orm.Metadata.DataEntity; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; + +namespace UnitTestProject2 +{ + [TestClass] + public class UnitTest1 + { + [TestMethod] + public void TestMethod1() + { + + //var a = new DynamicObject(new DynamicObjectType("COUNT_GAIN")); + + var a = new Dictionary>(); + a.Add("a", new Dictionary()); + a.Add("b", new Dictionary()); + + var keys = new[] { "a", "a", "b" }; + foreach (var key in keys) + { + var item = a[key]; + item.Add("ttt", "1232"); + } + + return; + } + } +} diff --git a/00.未分类/UnitTestProject2/UnitTestProject2.csproj b/00.未分类/UnitTestProject2/UnitTestProject2.csproj new file mode 100644 index 0000000..4963292 --- /dev/null +++ b/00.未分类/UnitTestProject2/UnitTestProject2.csproj @@ -0,0 +1,83 @@ + + + + + + Debug + AnyCPU + {3F9DAEFD-D6AF-4FA8-B6B2-485832AB9B26} + Library + Properties + UnitTestProject2 + UnitTestProject2 + v4.5 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.dll + + + ..\..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.App.dll + + + ..\..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.Core.dll + + + ..\..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.DataEntity.dll + + + ..\..\..\..\..\..\Program Files (x86)\Kingdee\K3Cloud\WebSite\bin\Kingdee.BOS.Model.dll + + + ..\..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + + + + + + + + + + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + + + \ No newline at end of file diff --git a/00.未分类/UnitTestProject2/packages.config b/00.未分类/UnitTestProject2/packages.config new file mode 100644 index 0000000..63f7626 --- /dev/null +++ b/00.未分类/UnitTestProject2/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/01.扩展/HandleUtils/HandleUtils.csproj b/01.扩展/HandleUtils/HandleUtils.csproj index 032c51e..37a1d6c 100644 --- a/01.扩展/HandleUtils/HandleUtils.csproj +++ b/01.扩展/HandleUtils/HandleUtils.csproj @@ -45,5 +45,12 @@ + + + + + + + \ No newline at end of file diff --git a/01.扩展/HandleUtils/sql/发票打印信息清空.sql b/01.扩展/HandleUtils/sql/发票打印信息清空.sql new file mode 100644 index 0000000..b4be540 --- /dev/null +++ b/01.扩展/HandleUtils/sql/发票打印信息清空.sql @@ -0,0 +1,15 @@ +SELECT + * +FROM + T_SAL_outstockfin +WHERE + FINVOICENUMBER != ''; + +UPDATE T_SAL_outstockfin +SET FINVOICENUMBER = '', +FINVOICEURL = '', +FFPQQLSH = '', +FFPLXDM = '' +WHERE + FINVOICENUMBER != '' + AND fentryid = 100041 \ No newline at end of file diff --git a/01.扩展/HandleUtils/sql/多组织即时库存查询.sql b/01.扩展/HandleUtils/sql/多组织即时库存查询.sql new file mode 100644 index 0000000..9e6355d --- /dev/null +++ b/01.扩展/HandleUtils/sql/多组织即时库存查询.sql @@ -0,0 +1,28 @@ + SELECT + T0.FMASTERID + ,T0.FMATERIALID + ,T0.FNUMBER + ,ISNULL(T1.STOCKQTY,0) AS FSTOCKQTY + ,T0.FUSEORGID + ,t2_l.FNAME + FROM + T_BD_MATERIAL T0 + LEFT JOIN T_BD_MATERIALPRODUCE T0P ON T0P.FMATERIALID = T0.FMATERIALID + LEFT JOIN ( + SELECT + T1.FMATERIALID + + ,t1.FSTOCKORGID + ,SUM(T1.FBASEQTY) AS STOCKQTY + FROM + T_STK_INVENTORY T1 + GROUP BY + T1.FMATERIALID, + t1.FSTOCKORGID + ) T1 ON T0.FMASTERID = T1.FMATERIALID --物料id + AND t0.FUSEORGID = t1.FSTOCKORGID --使用组织 + LEFT JOIN T_ORG_ORGANIZATIONS_L t2_l on t2_l.FORGID = t0.FUSEORGID AND t2_l.FLOCALEID =2052 + WHERE + T0.FDOCUMENTSTATUS = 'C' + AND t0.FNUMBER = '1.01.003' --物料编码 + ORDER BY T0.FMATERIALID \ No newline at end of file diff --git a/01.扩展/HandleUtils/sql/拼接表字段为查询语句.sql b/01.扩展/HandleUtils/sql/拼接表字段为查询语句.sql new file mode 100644 index 0000000..7b5eea4 --- /dev/null +++ b/01.扩展/HandleUtils/sql/拼接表字段为查询语句.sql @@ -0,0 +1,9 @@ +DECLARE @tableName VARCHAR(100),@alias varchar(100),@sql varchar(8000) +SET @tableName = 'T_PRD_PMPPBOMENTRY' +SET @alias = 't0e' +SELECT @sql = CONCAT('SELECT ', +STUFF((SELECT ',' + CHAR(10) +@alias+'.' + t0.name FROM SYSCOLUMNS t0 +WHERE ID = OBJECT_ID(@tableName) +ORDER BY t0.colid FOR XML PATH('')),1,1,''),CHAR(10),' FROM ' ,@tableName ,' ', @alias) + +PRINT @sql \ No newline at end of file diff --git a/01.扩展/HandleUtils/sql/查询字段所在表.sql b/01.扩展/HandleUtils/sql/查询字段所在表.sql new file mode 100644 index 0000000..6b48018 --- /dev/null +++ b/01.扩展/HandleUtils/sql/查询字段所在表.sql @@ -0,0 +1,11 @@ +SELECT + a.name 表名, + b.name 列名 +FROM + sysobjects a, + syscolumns b +WHERE + a.id= b.id + AND b.name LIKE '%FSTOCKID' + AND a.type= 'U' + AND a.name LIKE 'T_PRD_PPBOM%' \ No newline at end of file diff --git a/01.扩展/HandleUtils/sql/查询表名.sql b/01.扩展/HandleUtils/sql/查询表名.sql new file mode 100644 index 0000000..d37346a --- /dev/null +++ b/01.扩展/HandleUtils/sql/查询表名.sql @@ -0,0 +1,7 @@ +SELECT + * +FROM + sysobjects a +WHERE + a.name LIKE 'T_AR_RECEIVABLEENTRY%' + AND a.type= 'U' \ No newline at end of file diff --git a/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/HW.PRD_LackAnalyeBill.Python.py b/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/HW.PRD_LackAnalyeBill.Python.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/HW.PRD_LackAnalyeBill.Python.py @@ -0,0 +1 @@ + diff --git a/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/HW.PRD_LackAnalyeBill.Python.pyproj b/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/HW.PRD_LackAnalyeBill.Python.pyproj new file mode 100644 index 0000000..60b01b9 --- /dev/null +++ b/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/HW.PRD_LackAnalyeBill.Python.pyproj @@ -0,0 +1,38 @@ + + + Debug + 2.0 + 0bc2f871-b50d-41c3-9267-abde125d9b17 + . + HW.PRD_LackAnalyeBill.Python.py + + + . + . + HW.PRD_LackAnalyeBill.Python + HW.PRD_LackAnalyeBill.Python + + + true + false + + + true + false + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/sql/缺料分析单数据查询.sql b/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/sql/缺料分析单数据查询.sql new file mode 100644 index 0000000..0d6f697 --- /dev/null +++ b/03.珠海市汇威精密制造有限公司/HW.PRD_LackAnalyeBill.Python/sql/缺料分析单数据查询.sql @@ -0,0 +1,54 @@ +SELECT + t0.FID + ,t0.FBILLNO + ,t0e.FMATERIALID + ,t0e.FMUSTQTY + ,t0e.FPICKEDQTY + ,t0e.FINVQTY + ,t0e.FCANPICKEDQTY + ,t0e.FLACKQTY + ,t0e.FBOMID + ,t0e.FSUMMARYID + --,t0e.* +FROM T_PRD_LACKANALYSEBILL t0 + INNER JOIN T_PRD_LACKENTRY t0e on t0e.FID = t0.FID +--where t0.FID = 101203 +SELECT + --t0.FID + --,t0.FBILLNO + --,t0e.FMATERIALID + --,t0e.FSELECTED + --,t0e.FQTY + t0e.* +FROM T_PRD_LACKANALYSEBILL t0 + INNER JOIN T_PRD_LACKMOENTRY t0e on t0.FID = t0e.FID + +SELECT t1.FNUMBER,t0e_a.FSUMMARYID,* +FROM T_PRD_PMPPBOMENTRY t0e + INNER JOIN T_PRD_PMPPBOMENTRY_A t0e_a on t0e.FENTRYID = t0e_a.FENTRYID + INNER JOIN T_BD_MATERIAL t1 on t1.FMATERIALID = t0e.FMATERIALIDSUB +where t0e.FID = 101203 + --AND t1.FNUMBER = 'TSB074H000108O' + + +--MERGE INTO T_PRD_LACKENTRY U1 USING( +--SELECT S.FID,S.FSUMMARYID,S.FENTRYID,S1.FMOBILLNO +--FROM ( +-- SELECT T1.FID,T2.FSUMMARYID,MIN(T1.FENTRYID) AS FENTRYID +-- FROM T_PRD_PMPPBOMENTRY T1 +-- INNER JOIN T_PRD_PMPPBOMENTRY_A T2 ON T1.FENTRYID = T2.FENTRYID --and t1.fid = @lFId +-- GROUP BY T1.FID,T2.FSUMMARYID) S +-- INNER JOIN T_PRD_PMPPBOMENTRY S1 ON S.FENTRYID = S1.FENTRYID +-- INNER JOIN T_PRD_PMPPBOMENTRY_A S2 ON S.FENTRYID = S2.FENTRYID) U2 ON U1.FID = U2.FID AND U1.FSUMMARYID = U2.FSUMMARYID +--WHEN MATCHED +--THEN UPDATE SET U1.F_ISVCODE_MOBILLNO = U2.FMOBILLNO; + +--SELECT S.FID,S.FSUMMARYID,S.FENTRYID,S1.FMOBILLNO +--FROM ( +-- SELECT T1.FID,T2.FSUMMARYID,MIN(T1.FENTRYID) AS FENTRYID +-- FROM T_PRD_PMPPBOMENTRY T1 +-- INNER JOIN T_PRD_PMPPBOMENTRY_A T2 ON T1.FENTRYID = T2.FENTRYID --and t1.fid = @lFId +-- GROUP BY T1.FID,T2.FSUMMARYID) S +-- INNER JOIN T_PRD_PMPPBOMENTRY S1 ON S.FENTRYID = S1.FENTRYID +-- INNER JOIN T_PRD_PMPPBOMENTRY_A S2 ON S.FENTRYID = S2.FENTRYID + diff --git a/03.珠海市汇威精密制造有限公司/HW.PythonPlugIn/生产投料bom层级展示.py b/03.珠海市汇威精密制造有限公司/HW.PythonPlugIn/生产投料bom层级展示.py index f12e31f..e109a84 100644 --- a/03.珠海市汇威精密制造有限公司/HW.PythonPlugIn/生产投料bom层级展示.py +++ b/03.珠海市汇威精密制造有限公司/HW.PythonPlugIn/生产投料bom层级展示.py @@ -3190,7 +3190,7 @@ FROM ( ORDER BY FOrderNum,FSEQ1,FSEQ2,FSEQ3,FSEQ4,FSEQ5,FSEQ6 SELECT - t0.FMATERIALID AS 'ProMateralId' + t0.FMATERIALID AS 'ProMaterialId' ,t1e.FMATERIALID ,t1e_c.FSTOCKID --,t1.FBILLNO @@ -3210,12 +3210,13 @@ FROM #TEMPMO t0 GROUP BY t0.FMATERIALID,t1e.FMATERIALID,t1e_c.FSTOCKID -SELECT t0.ProMateralId,t0.MONOS,t0.SALENOS,t0.MOIDS,t0.MOENTRYIDS +SELECT t0.ProMaterialId,t0.MONOS,t0.SALENOS,t0.MOIDS,t0.MOENTRYIDS INTO #TEMPMONO2Pro FROM #TEMPMOQTY t0 -GROUP BY t0.ProMateralId,t0.MONOS,t0.SALENOS,t0.MOIDS,t0.MOENTRYIDS +GROUP BY t0.ProMaterialId,t0.MONOS,t0.SALENOS,t0.MOIDS,t0.MOENTRYIDS SELECT 序号 AS 'FIDENTITYID' + ,物料内码 ,物料代码,物料名称,规格型号,旧编码 ,上期结存,本期采购入库,本期耗用,期末结存 ,销售出库数量,仓库拨出数量,仓库拨入数量,申购未转数 @@ -3224,13 +3225,15 @@ SELECT 序号 AS 'FIDENTITYID' ,t1.FBASENEEDQTY ,t1.FBASENOPICKEDQTY ,t1.FBASEPICKEDQTY - ,CASE CHARINDEX(',',t2.MONOS) WHEN 0 THEN t2.MONOS ELSE '' END AS 'MONO' - ,CASE CHARINDEX(',',t2.SALENOS) WHEN 0 THEN t2.SALENOS ELSE '' END AS 'SALENO' - ,t2.SALENOS,t2.MOENTRYIDS,t2.MOIDS,t0.FProMaterialId + --,CASE CHARINDEX(',',t2.MONOS) WHEN 0 THEN t2.MONOS ELSE '' END AS 'MONO' + --,CASE CHARINDEX(',',t2.SALENOS) WHEN 0 THEN t2.SALENOS ELSE '' END AS 'SALENO' + ,t2.SALENOS AS SALENO + ,t2.MONOS AS MONO + ,t2.SALENOS,t2.MOENTRYIDS,t2.MOIDS,t2.ProMaterialId INTO {0} FROM #Stock_Bom t0 - LEFT JOIN #TEMPMONO2Pro t2 on t2.ProMateralId = t0.FProMaterialId - LEFT JOIN #TEMPMOQTY t1 ON t0.物料内码 = t1.FMATERIALID AND t0.仓库内码 = t1.FSTOCKID AND t0.FProMaterialId = t1.ProMateralId + LEFT JOIN #TEMPMONO2Pro t2 on t2.ProMaterialId = t0.FProMaterialId + LEFT JOIN #TEMPMOQTY t1 ON t0.物料内码 = t1.FMATERIALID AND t0.仓库内码 = t1.FSTOCKID AND t0.FProMaterialId = t1.ProMaterialId DROP TABLE #TEMPMO DROP TABLE #TEMPMOQTY diff --git a/03.珠海市汇威精密制造有限公司/HW.PythonPlugIn/穿透表.py b/03.珠海市汇威精密制造有限公司/HW.PythonPlugIn/穿透表.py index c47b14b..b0587dd 100644 --- a/03.珠海市汇威精密制造有限公司/HW.PythonPlugIn/穿透表.py +++ b/03.珠海市汇威精密制造有限公司/HW.PythonPlugIn/穿透表.py @@ -27,12 +27,37 @@ def CellDbClick(e): e.Cancel = True fldKey = e.Header.FieldName; # 嵥 + # + # if fldKey == "FBASENEEDQTY": + # reportModel = this.Model + # tab = reportModel.DataSource + # row = e.CellRowIndex - 1 + # data = tab.Rows[row] + # moIds = "0"; + # if data["MOIDS"] !=None and data["MOIDS"] != "": + # moIds = data["MOIDS"]; + # filterStr = "FID IN ({0}) AND FMATERIALID = {1} ".format(moIds,data["ProMaterialId"]) + # ShowListForm("PRD_MO", filterStr) if fldKey == "FBASENEEDQTY": reportModel = this.Model tab = reportModel.DataSource row = e.CellRowIndex - 1 data = tab.Rows[row] - filterStr = "FID IN ({0}) AND FMATERIALID = {1} ".format(data["MOIDS"],data["FProMaterialId"]) + moIds = "0"; + if data["MOIDS"] !=None and data["MOIDS"] != "": + moIds = data["MOIDS"]; + filterStr = "t1.FMOID IN ({0}) AND t1.FMATERIALID = {1} ".format(moIds,data[""]) + ShowListForm("PRD_PPBOM", filterStr) + # + if fldKey == "FBASEPICKEDQTY": + reportModel = this.Model + tab = reportModel.DataSource + row = e.CellRowIndex - 1 + data = tab.Rows[row] + moIds = "0"; + if data["MOIDS"] !=None and data["MOIDS"] != "": + moIds = data["MOIDS"]; + filterStr = "FID IN ({0}) AND FMATERIALID = {1} ".format(moIds,data["ProMaterialId"]) ShowListForm("PRD_MO", filterStr) def ShowListForm(_fromId, _filter, _operationStatus = OperationStatus.VIEW ,_openStyleShowType = ShowType.Floating): diff --git a/05.长园/CY.PRD_MORPT.Python/CY.PRD_MORPT.Python.py b/05.长园/CY.PRD_MORPT.Python/CY.PRD_MORPT.Python.py index c55ea33..dd3452d 100644 --- a/05.长园/CY.PRD_MORPT.Python/CY.PRD_MORPT.Python.py +++ b/05.长园/CY.PRD_MORPT.Python/CY.PRD_MORPT.Python.py @@ -32,7 +32,7 @@ def OnPreparePropertys(e): e.FieldKeys.Add("FHRWORKTIME") def EndOperationTransaction(e): - # 8ύ9126 + # 8ύ9126ɾ3 if this.FormOperation.OperationId == 1: # sqlList = """""" sqlLList=List[str](); diff --git a/05.长园/CY.PRD_MORPT.Python/CY.PRD_MORPT.Python.pyproj b/05.长园/CY.PRD_MORPT.Python/CY.PRD_MORPT.Python.pyproj index 224fe41..4cd99a0 100644 --- a/05.长园/CY.PRD_MORPT.Python/CY.PRD_MORPT.Python.pyproj +++ b/05.长园/CY.PRD_MORPT.Python/CY.PRD_MORPT.Python.pyproj @@ -29,6 +29,7 @@ +