24 Commits (48e149778992b143fbd0198189f1d0da2a8331ee)

Author	SHA1	Message	Date
wangsr	cc10602c3f	Merge branch 'dep_yangw' into wangsr ... # Conflicts: # Main/MCEdit/Data/MCProject/nodeDataSource.xml # Main/MCEdit/Data/MCProject/nodeDevice.xml	2 years ago
nodyang	25a475a47f	删除plc	2 years ago
wangsr	acef76c492	add - 电机调试窗口、逻辑、plc连接（待测试优化）	2 years ago
nodyang	9379b9d227	Merge branch 'wangsr' into dep ... # Conflicts: # Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs # Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs # Main/MCEdit/Data/MCProject/SCWSProject2.mprj	2 years ago
nodyang	eed38ad76e	Merge branch 'dep_plan' into dep ... # Conflicts: # Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs # Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs # Main/MCEdit/Data/MCProject/SCWSProject2.mprj	2 years ago
nodyang	2c79df191e	代码整理	2 years ago
wangsr	1925bef7a6	add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善	2 years ago
wangsr	a3d5f972db	解决冲突 合并	2 years ago
wangsr	fbf5894f9f	测试	2 years ago
wenjy	fcdf6ce7d6	change - 干混机报表数据读取	2 years ago
nodyang	425828021a	临时提交	2 years ago
nodyang	e068ae7bb0	TestAction	2 years ago
nodyang	a61f54582e	周五特别版本	2 years ago
nodyang	b20ef12c7e	asd	2 years ago
nodyang	485e125ed5	ti	2 years ago
nodyang	0c97c41f7c	设备管理	2 years ago
nodyang	c971b5330b	临时提交	2 years ago
nodyang	9cb1a81080	0628 对plc 就行测试	2 years ago
nodyang	ba97852627	dll testActioc 测试代码	2 years ago
nodyang	a69f8847d8	E:\mesnac\化工项目源码\源码	2 years ago
baogq	5c20c450f9	20220907保存最新源码	2 years ago
wenjy	d804444f07	change - 计划重传、终止	3 years ago
wenjy	2b60edee67	读取plc计划执行状态	3 years ago
wenjy	e8df0f97a7	添加项目文件。	3 years ago