zhaojian
|
b996f8388a
|
报修接口,打卡功能
|
2 years ago |
|
zhaojian
|
5d84acc2a8
|
集成打卡功能,修改报修功能
|
2 years ago |
zhaoaomin
|
e9bdecf486
|
计件薪酬和人员刷卡改动
|
2 years ago |
|
zhaojian
|
9fe5e82fb3
|
添加超时
|
2 years ago |
|
zhaojian
|
bca87c17a5
|
添加超时判断
|
2 years ago |
|
zhaojian
|
fa9d630b9e
|
修改界面样式,修复称重停止
|
2 years ago |
|
zhaojian
|
9350679d8f
|
com口配置
|
2 years ago |
|
zhaojian
|
20f79fc0a1
|
合并
|
2 years ago |
|
zhaojian
|
11b2bdb866
|
添加称重系统
|
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
|
2f18ceeba2
|
榄菊成型机报工功能优化，
|
2 years ago |
|
zhaoaomin
|
8894d764bb
|
1、上位机展示SAP订单号；
2、报工的时候，不给upload_time 赋值；
3、修改报工界面展示顺序
|
2 years ago |
|
zhaoaomin
|
23c06a5f17
|
取消用户校验
|
2 years ago |
|
zhaoaomin
|
c0b6273a50
|
修改ping成型机ip的时间
|
2 years ago |
|
zhaoaomin
|
fcb9959490
|
交接班、设备ping测试
|
2 years ago |
|
zhaoaomin
|
e0cb00aec5
|
优化自动更新、成品报工、操作日志等。。。
|
2 years ago |
|
zhaoaomin
|
4f9ec5720a
|
成品报工
|
2 years ago |
|
zhaoaomin
|
e39a220821
|
成品消耗报工、领料单展示、烘房数量展示
|
2 years ago |
|
zhaoaomin
|
e4811a1857
|
修改报工界面样式
|
2 years ago |
zhaojian
|
6a15770b57
|
上位机看板添加数量
|
2 years ago |
|
zhaojian
|
7188d87adf
|
添加烘房界面根据车辆展示
|
2 years ago |
|
zhaojian
|
bdccaed88c
|
添加空行
|
2 years ago |
|
zhaojian
|
b0f4d58240
|
添加选择批次号和最终报工,但是确认按钮逻辑没写
|
2 years ago |
|
zhaoaomin
|
4a26abec4e
|
成品界面添加批次信息展示
|
2 years ago |
|
zhaoaomin
|
5864a69187
|
成品报工优化
|
2 years ago |
|
zhaoaomin
|
f9f2d65e33
|
成品添加字母工单更新功能；优化烘房界面；成品登录修改
|
2 years ago |
|
zhaojian
|
70242d2c2a
|
修改上位机更新程序
|
2 years ago |
|
zhaojian
|
afb9e5565d
|
Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client
# Conflicts:
# shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
|
2 years ago |
|
zhaojian
|
8fb5c22370
|
添加开始工单
|
2 years ago |
|
zhaoaomin
|
db791f27cd
|
bug修改
|
2 years ago |
|
zhaoaomin
|
3a067640b4
|
优化报工
|
2 years ago |
|
zhaojian
|
b82d78f7a0
|
修改在code上加了一个0 修复包公接口
|
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 |
|
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 |
RgnahZ
|
02723809b2
|
1
|
2 years ago |