Commit Graph

61 Commits (cc26587ff6d7025e0e35f9ad14f2aa787db4879a)

Author SHA1 Message Date
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-来料检验不合格控制流程代码
zhaoxiaolin 0b302ed86e 入库检验任务接口+巡检任务调整
zhaoxiaolin 30fac0e8dd 质量过程巡检+来料检验任务接口+报工sql调整
zhaoxiaolin 3671723f7e 质量看板接口修改3
zhaoxiaolin 8a325fc57b 质量看板接口修改2
zhaoxiaolin bb18fbce4a 质量看板接口修改
zhaoxiaolin e6c56963a1 确认修改接口,我那我就改了:之前有工单维度,现在要求去掉工单
wws 14937d6441 上位机设备报修接口
zhaoxiaolin 56fc72ff0d sap报工
zhaoxiaolin 304370cde2 sap接口调整3
zhaoxiaolin d248021e95 sap接口调整3
zhaoxiaolin aecbb658f2 sap接口调整2
zhaoxiaolin 1f31239adb sap接口调整