diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 82b0d19..8368aa9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -153,9 +153,6 @@ False ..\..\..\PlugInPlatform\Mesnac.PlugIn.dll - - ..\Microsoft.Office.Interop.Excel.dll - @@ -831,15 +828,6 @@ - - {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} - 2 - 8 - 0 - primary - False - True - {00020813-0000-0000-C000-000000000046} 1 diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.糊化机报表.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.糊化机报表.xml index f1201ac..d0e23fc 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.糊化机报表.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.糊化机报表.xml @@ -2,20 +2,20 @@ - + 窗体初始化 窗体初始化 - + 查询 查询糊化机报表 - + 报表明细 报表明细 - + 导出 导出糊化机报表 @@ -24,27 +24,26 @@ - - + + - - + + - - + + - - - + + - - - - + + + + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeDataSource.xml b/Main/MCEdit/Data/MCProject/nodeDataSource.xml index 2859a24..3600a0d 100644 --- a/Main/MCEdit/Data/MCProject/nodeDataSource.xml +++ b/Main/MCEdit/Data/MCProject/nodeDataSource.xml @@ -1,5 +1,3 @@ - - - + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml b/Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml index 51c13eb..23059c2 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml @@ -214,7 +214,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAZAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIxMURENTBDOTlDQTQwODhBRDMzMDdDMDQwQzhCRDlDBgYAAAAG5p+l6K+iBgcAAAAV5p+l6K+i57OK5YyW5py65oql6KGoCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAdAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEY1OTI2REE5Q0E3NjQ1QTM4RjJGMUExQzNDM0ZGN0VGBgYAAAAG5p+l6K+iBgcAAAAV5p+l6K+i57OK5YyW5py65oql6KGoCw== @@ -287,7 +287,7 @@ 6 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDQ2MzM1OUI1NUZFQzQ1MjZCMkZBNDNBODZFODE2OENCBgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQzMEM2MEEzNEUwMjRBNDVBMUQzQjdBNjhBNUM0Qzg2BgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCRun/Data/EventConfig/小料称量/我叫锄头.xml b/Main/MCRun/Data/EventConfig/小料称量/我叫锄头.xml new file mode 100644 index 0000000..06c3706 --- /dev/null +++ b/Main/MCRun/Data/EventConfig/小料称量/我叫锄头.xml @@ -0,0 +1,34 @@ + + + + + + 窗体初始化 + 窗体初始化 + + + 弹出窗体 + 弹出窗体 + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.干混机报表.xml b/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.干混机报表.xml new file mode 100644 index 0000000..77cc748 --- /dev/null +++ b/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.干混机报表.xml @@ -0,0 +1,51 @@ + + + + + + 窗体初始化 + 窗体初始化 + + + 查询 + 查询干混机报表 + + + 报表明细 + 报表明细 + + + 导出 + 导出干混机报表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.湿混机报表.xml b/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.湿混机报表.xml new file mode 100644 index 0000000..d9fb4fa --- /dev/null +++ b/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.湿混机报表.xml @@ -0,0 +1,52 @@ + + + + + + 窗体初始化 + 窗体初始化 + + + 查询 + 查询湿混机报表 + + + 报表明细 + 报表明细 + + + + 导出 + 导出湿混机报表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.糊化机报表.xml b/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.糊化机报表.xml new file mode 100644 index 0000000..f1201ac --- /dev/null +++ b/Main/MCRun/Data/EventConfig/小料称量/榄菊报表.糊化机报表.xml @@ -0,0 +1,50 @@ + + + + + + 窗体初始化 + 窗体初始化 + + + 查询 + 查询糊化机报表 + + + 报表明细 + 报表明细 + + + + 导出 + 导出糊化机报表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCRun/Data/EventConfig/小料称量/榄菊生产计划管理.xml b/Main/MCRun/Data/EventConfig/小料称量/榄菊生产计划管理.xml new file mode 100644 index 0000000..b81d3a8 --- /dev/null +++ b/Main/MCRun/Data/EventConfig/小料称量/榄菊生产计划管理.xml @@ -0,0 +1,59 @@ + + + + + + 初始计划管理 + 初始计划管理 + + + 修改计划管理 + 修改计划管理 + + + + 添加计划管理 + 添加计划管理 + + + + 删除计划管理 + 删除计划管理 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Main/MCRun/Data/EventConfig/小料称量/榄菊设备数据管理.xml b/Main/MCRun/Data/EventConfig/小料称量/榄菊设备数据管理.xml new file mode 100644 index 0000000..aacea2b --- /dev/null +++ b/Main/MCRun/Data/EventConfig/小料称量/榄菊设备数据管理.xml @@ -0,0 +1,60 @@ + + + + + + 初始设备数据 + 初始设备数据 + + + + 修改设备数据 + 修改设备数据 + + + + 同步设备数据 + 同步设备数据 + + + + 下发设备数据 + 下发设备数据 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mesnac.DoUtils.zip b/Mesnac.DoUtils.zip deleted file mode 100644 index eb2344b..0000000 Binary files a/Mesnac.DoUtils.zip and /dev/null differ diff --git a/Mesnac.PlcUtils.zip b/Mesnac.PlcUtils.zip deleted file mode 100644 index b4f5e66..0000000 Binary files a/Mesnac.PlcUtils.zip and /dev/null differ