Yangwl
/
lanju-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51 Commits
1 Branch
0 Tags
115 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f0467c983a'
${ noResults }
Commit Graph

51 Commits (f0467c983a7ad93887df1b24207ab951eac0b50e)
 

Author SHA1 Message Date
zhaoaomin f0467c983a Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client 2 years ago
zhaoaomin 73461fc299 查看日志优化 2 years ago
zhaojian 461e817ad8 添加烘房的排序 2 years ago
zhaoaomin 9c96b4f7e9 添加成品、打卡等功能 2 years ago
zhaojian dafa4c5927 添加烘房小看板 2 years ago
zhaoaomin 2d708bbf14 修改成型机界面显示数据少一行的问题 2 years ago
zhaoaomin 1d650f187d 1、修改烘房界面样式； 
2、修改成型机班次获取逻辑；
 2 years ago
zhaojian 84e61519c4 添加查询烘房plc值变更sql 2 years ago
zhaojian ef2f83d674 添加烘房进入log 2 years ago
zhaojian e20452af69 添加上位机log查看 2 years ago
zhaoaomin abb306a947 优化当前机台完成数 2 years ago
zhaoaomin 9dafaf3738 1 2 years ago
zhaoaomin 6da8eca0c6 修改成型机取数逻辑 2 years ago
zhaojian 13b9b11cf9 111 2 years ago
zhaoaomin 99b9faeeba 修改近期提出的问题 2 years ago
zhaojian 13a4741496 优化界面 2 years ago
zhaojian 5657265016 添加烘房屏蔽设备 2 years ago
zhaojian 1753c5463e 展示设备名称 2 years ago
zhaojian 571b1ca157 添加开始计划界面提取工序 2 years ago
zhaojian 742ecdd331 Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client 2 years ago
zhaojian f41edf8882 取数逻辑更改 2 years ago
zhaoaomin 2cb4f9f470 添加报警日志，关闭程序取消报警功能 2 years ago
zhaoaomin 85db29be92 修复产量bug 2 years ago
zhaoaomin 3a5d3cbc8e 工单准备添加时间查询 2 years ago
zhaoaomin a4c0387dba 查看plc信息 2 years ago
zhaoaomin f08d3f4f92 添加查看日志 2 years ago
zhaoaomin 2e981a9d0b 添加设备异常、网络断开启报警灯 2 years ago
zhaojian 9f4c8e36f8 添加自动更新 2 years ago
zhaoaomin 53d71237c4 操作界面优化 2 years ago
zhaoaomin accfac0f5b 优化成型机界面 2 years ago
zhaoaomin fb40384450 1007 2 years ago
zhaoaomin 26c57b329a 1 2 years ago
zhaoaomin 6471c6c5b3 烘房取数逻辑修改、工单准备物料清单添加 2 years ago
zhaoaomin 074b4aa611 092701 2 years ago
zhaoaomin bc9b5c993f 0927 2 years ago
zhaoaomin 5496895696 查看工艺、物料、SOP 2 years ago
zhaoaomin 20f8cbb815 优化 2 years ago
zhaoaomin ce06ec1e6e 同步湿料计划加工厂号 2 years ago
zhaoaomin 634e91451f 1 2 years ago
zhaoaomin 8343a7a915 2 2 years ago
zhaoaomin f4671dbbfd 1 2 years ago
zhaoaomin c3bf79ee59 同步物料 2 years ago
zhaojian 4041880366 Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client 
# Conflicts:
#	shangjian/.vs/BL/v17/.suo
#	shangjian/CentralControl/bin/Debug/CentralControl.exe
#	shangjian/CentralControl/bin/Debug/CentralControl.pdb
#	shangjian/CentralControl/bin/Debug/CommonFunc.dll
#	shangjian/CentralControl/bin/Debug/CommonFunc.pdb
#	shangjian/CentralControl/bin/Debug/XGL.Data.dll
#	shangjian/CentralControl/bin/Debug/XGL.Data.pdb
#	shangjian/CentralControl/bin/Debug/XGL.Models.dll
#	shangjian/CentralControl/bin/Debug/XGL.Models.pdb
#	shangjian/CentralControl/bin/Debug/XGL.Thrift.dll
#	shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb
#	shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
#	shangjian/CentralControl/obj/Debug/CentralControl.exe
#	shangjian/CentralControl/obj/Debug/CentralControl.pdb
#	shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll
#	shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb
#	shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll
#	shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb
#	shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache
#	shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll
#	shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb
#	shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache
#	shangjian/LanJuLib/bin/Debug/CommonFunc.dll
#	shangjian/LanJuLib/bin/Debug/CommonFunc.pdb
#	shangjian/LanJuLib/bin/Debug/XGL.Models.dll
#	shangjian/LanJuLib/bin/Debug/XGL.Models.pdb
#	shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache
#	shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll
#	shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb
#	shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll
#	shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb
#	shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll
#	shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb
#	shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache
#	shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache
#	shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll
#	shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb
#	shangjian/XGL.Model/bin/Debug/XGL.Models.dll
#	shangjian/XGL.Model/bin/Debug/XGL.Models.pdb
#	shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache
#	shangjian/XGL.Model/obj/Debug/XGL.Models.dll
#	shangjian/XGL.Model/obj/Debug/XGL.Models.pdb
#	shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll
#	shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb
#	shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll
#	shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb
#	shangjian/XGL/Views/LanJu_Prepare.xaml.cs
#	shangjian/XGL/bin/x86/Debug/CentralControl.exe
#	shangjian/XGL/bin/x86/Debug/CentralControl.pdb
#	shangjian/XGL/bin/x86/Debug/CommonFunc.dll
#	shangjian/XGL/bin/x86/Debug/CommonFunc.pdb
#	shangjian/XGL/bin/x86/Debug/XGL.Data.dll
#	shangjian/XGL/bin/x86/Debug/XGL.Data.pdb
#	shangjian/XGL/bin/x86/Debug/XGL.Models.dll
#	shangjian/XGL/bin/x86/Debug/XGL.Models.pdb
#	shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll
#	shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb
#	shangjian/XGL/bin/x86/Debug/XGL.exe
#	shangjian/XGL/bin/x86/Debug/XGL.pdb
#	shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache
#	shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
#	shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
#	shangjian/XGL/obj/x86/Debug/XGL.exe
#	shangjian/XGL/obj/x86/Debug/XGL.g.resources
#	shangjian/XGL/obj/x86/Debug/XGL.pdb
#	shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
#	shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
 2 years ago
zhaojian 4afca33c60 合并 2 years ago
zhaoaomin babf7ea9e3 3 2 years ago
zhaoaomin 003a06b138 同步湿料计划修改 2 years ago
zhaoaomin d10167d167 3 2 years ago
zhaoaomin b66ef34504 2 2 years ago
zhaoaomin 6be6e7cf83 no message 2 years ago
zhaoaomin 3f912dd198 1 2 years ago