启龙 曹
|
9ea2ab0b5c
|
change -添加每日安全检查报表功能，添加了几个操作数据库方法
|
9 months ago |
范
|
a1de882869
|
写入plc信息
|
12 months ago |
|
范
|
d1ac75ddec
|
11
|
1 year ago |
|
范
|
46758b8985
|
Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client
|
1 year ago |
|
范
|
2faf493cbb
|
添加报表页面
|
1 year ago |
zhaojian
|
f3db1971ee
|
修改故障设备
|
1 year ago |
|
zhaojian
|
1db6c5c627
|
重做打卡界面,优化计件薪酬界面
|
2 years ago |
|
zhaojian
|
b996f8388a
|
报修接口,打卡功能
|
2 years ago |
|
zhaojian
|
5d84acc2a8
|
集成打卡功能,修改报修功能
|
2 years ago |
zhaoaomin
|
8bb8dd5bfa
|
白胚报修
|
2 years ago |
|
zhaojian
|
f8cd3171f9
|
添加称重界面
|
2 years ago |
|
zhaoaomin
|
23b137dd29
|
20240506
|
2 years ago |
|
zhaoaomin
|
11da21ae79
|
一波新版报工、计件薪酬等
|
2 years ago |
|
zhaoaomin
|
8894d764bb
|
1、上位机展示SAP订单号；
2、报工的时候，不给upload_time 赋值；
3、修改报工界面展示顺序
|
2 years ago |
|
zhaoaomin
|
e0cb00aec5
|
优化自动更新、成品报工、操作日志等。。。
|
2 years ago |
|
zhaoaomin
|
e4811a1857
|
修改报工界面样式
|
2 years ago |
|
zhaoaomin
|
f9f2d65e33
|
成品添加字母工单更新功能；优化烘房界面；成品登录修改
|
2 years ago |
|
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 |
|
zhaoaomin
|
1d650f187d
|
1、修改烘房界面样式；
2、修改成型机班次获取逻辑；
|
2 years ago |
|
zhaoaomin
|
99b9faeeba
|
修改近期提出的问题
|
2 years ago |
|
zhaojian
|
1753c5463e
|
展示设备名称
|
2 years ago |
|
zhaojian
|
571b1ca157
|
添加开始计划界面提取工序
|
2 years ago |
|
zhaojian
|
f41edf8882
|
取数逻辑更改
|
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
|
accfac0f5b
|
优化成型机界面
|
2 years ago |
|
zhaoaomin
|
fb40384450
|
1007
|
2 years ago |
|
zhaoaomin
|
26c57b329a
|
1
|
2 years ago |
|
zhaoaomin
|
074b4aa611
|
092701
|
2 years ago |
|
zhaoaomin
|
5496895696
|
查看工艺、物料、SOP
|
2 years ago |
|
zhaoaomin
|
20f8cbb815
|
优化
|
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
|
b66ef34504
|
2
|
2 years ago |
|
zhaoaomin
|
6be6e7cf83
|
no message
|
2 years ago |
|
zhaoaomin
|
3f912dd198
|
1
|
2 years ago |
RgnahZ
|
02723809b2
|
1
|
2 years ago |