Commit Graph

40 Commits (ef46dce82834b1b9faec74553beba97f83930200)

Author SHA1 Message Date
wangsr 6f79836a47 change - 合并问题修改 1 year ago
wangsr 75b3867d42 change - 项目简化 1 year ago
wangsr 0cf3236699 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs
1 year ago
wangsr e8899e6ec7 change - 拉取前提交 1 year ago
wangsr fad95ec358 change - 简化代码初步 1 year ago
wangsr a9a63d5d9e change - 更改布局 1 year ago
wangsr c32d14d2f9 update - 小修改 1 year ago
wangsr 1f219d415c 修复代码 1 year ago
wangsr 46ce634bd5 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs
1 year ago
wangsr 4bfc54b494 测试提交 1 year ago
wangsr 02c1e461dd add - 榄菊计划管理 新增查询条件 1 year ago
wangsr 8455a4b825 change - 加载界面 1 year ago
wangsr d9980be420 合并 1 year ago
wangsr 67ab37d415 Add - LJPlanning-TestAction等待实装 1 year ago
wangsr 65848c2175 add - 添加计划状态下拉框 数据库变更 1 year ago
wangsr 6e98ca3d4c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 37fcb77890 change - 计划配方新增查询功能 1 year ago
nodyang 9c5ad7a7c5 准备继承 hsl 1 year ago
wangsr a62b3fc913 change - yw保存报表界面美化 1 year ago
nodyang cd50514e00 修复按钮 1 year ago
nodyang 7e71fd990b 2107 add 新增数据库2107 1 year ago
nodyang a5e0b1e767 0912 测试计划的版本呢 1 year ago
nodyang 9fbf00b15f mege 1 year ago
nodyang 1f0c2da3d3 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907 1 year ago
nodyang 7848b05546 merge 1 year ago
wangsr 28de46fb64 change - 界面美化 1 year ago
nodyang 9f13b74e6d 0907 晚上临时提交 1 year ago
wangsr 62bbcfaf91 解决合并冲突 最终正常期望版本 1 year ago
nodyang e6ce524df2 0907 1 year ago
wangsr d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑 1 year ago
nodyang 4e0213df1b 榄菊新的管理 1 year ago
nodyang c72bd4553b add 重新编辑配方 1 year ago
nodyang d48a870f9f 页面整合处理 1 year ago
nodyang a1c9ba3aac 生产计划 1 year ago
nodyang 57880f5e4e 0830 提交 1 year ago
nodyang ef5ad1188a fixCode 1 year ago
wangsr 39159ad352 窗口美化 完毕 1 year ago
nodyang 425828021a 临时提交 1 year ago
nodyang e4da793b9c 临时提交代码到服务器 1 year ago
nodyang a441d9ca59 0801 临时提交 1 year ago