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

12 Commits (23b137dd290be14349e3cf1500173e02c4f8ab6a)

Author SHA1 Message Date
zhaoaomin 23b137dd29 20240506 2 years ago
zhaoaomin 11da21ae79 一波新版报工、计件薪酬等 2 years ago
zhaoaomin 8894d764bb 1、上位机展示SAP订单号； 
2、报工的时候，不给upload_time 赋值；
3、修改报工界面展示顺序
 2 years ago
zhaoaomin 9c96b4f7e9 添加成品、打卡等功能 2 years ago
zhaoaomin 2e981a9d0b 添加设备异常、网络断开启报警灯 2 years ago
zhaojian 9f4c8e36f8 添加自动更新 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 3f912dd198 1 2 years ago
RgnahZ 02723809b2 1 2 years ago