Commit Graph

73 Commits (52c9c41a6dde904c481861825775a1aa52a481ff)

Author SHA1 Message Date
zhaoxiaolin ef2cae1d7b 企业微信默认用工号
zhaoxiaolin 9ba60dba19 成品检验
A0010407 81d4b8cc51 2024-5-24 设备-上位机-报修之后-发送微信+PDA修改
A0010407 b777ca8e48 2024-5-23 设备管理-PC端报修-微信提醒 + open模块微信Post方法错误
A0010407 3332d91cd1 2024-5-22 open模块-上位机报修新加字段 故障描述
zhaoxiaolin 6ad5ed5fdd 领料单升级+报工批次删除功能
zhaoxiaolin 715222563e 微信接口+bug
Yangwl 3b8717318b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
Yangwl 78229d7662 工艺路线同步接口优化
zhaoxiaolin 7e524978f1 质量手持更新
zhaoxiaolin 3c0d9f16ad mes相关
zhaoxiaolin f27d2dcbe9 动态数据源垮系统加载
zhaoxiaolin b0c2ef28cf qc bug修改2
zhaoxiaolin 767eef01fb 报工+批次可以重复+其它细节功能改善4
zhaoxiaolin 29c2ca8448 报工+批次可以重复+其它细节功能改善2
zhaoxiaolin dd16e06623 报工+批次可以重复+其它细节功能改善
zhaoxiaolin 8a0a9b7634 人员信息同步+报工修改
zhaoxiaolin 5676606f68 问题清单处理1.0
zhaoxiaolin 217a7ee237 巡检任务调整回一小时产生一条;成品订单编辑/删除功能优化
zhaoxiaolin adbf632d74 巡检任务会多一条
zhaoxiaolin 93d33895e7 报工公式修改+订单关闭接口修改+巡检多出一条的bug修复
陈恒杰 3504cefcb1 粉料接口
Yangwl 01dd5b5629 本地保存
Yangwl 661cb1f822 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
zhaoxiaolin b9df5a579f 人力信息同步
Yangwl f31e349642 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
Yangwl 4fc8f1c0cc 获取HR部门和岗位信息
zhaoxiaolin 2e2e572fad 巡检加载超时优化2
Yangwl 274798eff7 报工新页面,计件工资界面编写。
Yangwl 91f358251a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
#	op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
Yangwl 96a604e73d HR接口
zhaoxiaolin b6b83b4c2a 过程检验检验结果二次确认逻辑
zhaoxiaolin a8fa036f00 质量调整
zhaoxiaolin a3d8664eb2 错误信息输出
zhaoxiaolin eb7d0122b2 不合格流程提交
Yangwl b28a727d83 Merge remote-tracking branch 'origin/master'
Yangwl 2b3e9a69cb SAP订单物料过账修改
zhaoxiaolin 1b04a3f94e 不合规问题处理+报工问题修改
Yangwl 9d882c2dde Merge remote-tracking branch 'origin/master'
Yangwl 8a97240e84 OA接口完善
wws 07982d9b16 上位机报修
zhaoxiaolin 6473691de9 oa修改-
Yangwl ddfb519fbf Merge remote-tracking branch 'origin/master'
Yangwl bd8870982d OA接口
zhaoxiaolin 52f2be01fd 巡检触发逻辑变更
Yangwl 61c37758f8 计件薪酬、包装线看板接口
Yangwl cdd852bf07 字段注释
Yangwl 0ec681686e OA提交字段注释
Yangwl cf0d987365 Merge remote-tracking branch 'origin/master'
Yangwl d2e644b74b OA ZL0010-来料检验不合格控制流程代码