Commit Graph

895 Commits (d6d6d33110308373619bbd37d39d8d96e8eb7f02)

Author SHA1 Message Date
zhaoxiaolin d6d6d33110 检验手持接口修改
zhaoxiaolin 9971a509bc 检验手持接口修改
Yangwl cdd852bf07 字段注释
Yangwl 308492d614 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java
zhaoxiaolin 02fb55dc6e 新增白坯工单管理
Yangwl 0ec681686e OA提交字段注释
Yangwl cf0d987365 Merge remote-tracking branch 'origin/master'
Yangwl d2e644b74b OA ZL0010-来料检验不合格控制流程代码
zhaoxiaolin 6624eb2992 入库检验工单修改来源表
陈恒杰 9d37d5eb05 Merge remote-tracking branch 'origin/master'
陈恒杰 1d23f85a3c 手动创建白坯入库单修改
zhaoxiaolin 949a7f8f33 入库检验工单修改来源表
zhaoxiaolin e6554a9e41 订单管理bug修改
陈恒杰 a0afd6a4fa Merge remote-tracking branch 'origin/master'
陈恒杰 a953d4eb29 手动创建白坯入库单
wws e6b7588488 Merge remote-tracking branch 'origin/master'
wws 5f0a78bbe9 白坯合格统计
陈恒杰 b032991675 Merge remote-tracking branch 'origin/master'
陈恒杰 62084d080b 手动创建白坯入库单
zhaoxiaolin 0b302ed86e 入库检验任务接口+巡检任务调整
zhaoxiaolin 86e6b205a0 入库检验任务接口
zhaoxiaolin a4ad441dad 质量过程巡检+来料检验任务接口+报工sql调整
陈恒杰 7118604055 Merge remote-tracking branch 'origin/master'
wws 5efb7d4582 Merge remote-tracking branch 'origin/master'
wws 3bd7eeb1ed 维修/保养-备件单价逻辑
陈恒杰 796126ccd0 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 30fac0e8dd 质量过程巡检+来料检验任务接口+报工sql调整
shaoyong 4e65a7d092 检验人员多选
陈恒杰 d189457891 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 63cc8e2053 质量过程巡检+来料检验任务接口
mengjiao 826576045e wms修改9.4
陈恒杰 8e96bc5717 Merge remote-tracking branch 'origin/master'
mengjiao 316e221ffa wms修改9.3
mengjiao 74032decd5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java
#	op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
mengjiao 4dced6b421 wms修改9.2
wws c0614e3cf8 看板接口便变更
wws 4edeb71b91 设备完好率
陈恒杰 d903ee4b66 Merge remote-tracking branch 'origin/master'
wws 1971818ea3 Merge remote-tracking branch 'origin/master'
wws f5060ed72c 设备运行记录年备份定时任务
zhaoxiaolin f1f895ee20 质量质检+工单管理界面加入母单信息+首页图表
陈恒杰 eebf7a2cf5 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 245301f4f8 质量质检qc_status添加批次
zhaoxiaolin e9528b28da 质量质检qc_status添加批次
zhaoxiaolin 04681b3623 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 0ccb32d068 质量质检qc_status添加
陈恒杰 db81932f2c Merge remote-tracking branch 'origin/master'
zhaoxiaolin 4dd5c4895f 报错修改
zhaoxiaolin 3671723f7e 质量看板接口修改3
A0010407 b27e18f403 基础信息 设备加字段 + 设备看板完好设备比问题