Commit Graph

927 Commits (8bc7cd17ce4b6821cf4ca92f0a829168c2a61426)
 

Author SHA1 Message Date
zhaoxiaolin 42b9c09918 bug修改
A0010407 39b392d037 报修+维修+委外
wws c7e42f4045 Merge remote-tracking branch 'origin/master'
wws 8152b17171 保养计划-新增
shaoyong ee48170cc8 人员物料绑定查询修改
zhaoxiaolin ac16a5d785 入库过程检验
zhaoxiaolin 7c6d5a1b4f 生产过程检验v4
zhaoxiaolin 94010d9146 生产过程检验v3
shaoyong e25f223632 人员物料绑定修复
wws 35b354562b 保养计划
wws c0daf9a89a Merge remote-tracking branch 'origin/master'
wws 45c3b2b7c9 手持接口-巡检工单-提交接口
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录
shaoyong 7329c54eab 物料检验项目维护修复
wws f60d6559f9 Merge remote-tracking branch 'origin/master'
wws fab6f3aa28 手持接口-巡检工单
shaoyong 3c40a7df23 物料检验项目维护
zhaoxiaolin c1fac1f909 原料检验任务1.0
wws b865658cb2 巡检工单填写记录
wws fc69128a8c Merge remote-tracking branch 'origin/master'
wws dcbde38d27 巡检工单填写记录V1
A0010407 870fde44b5 报修
A0010407 d5ae6cea2c 报修+委外工单
Yangwl 4fd8301700 SAP配置
wws aedd7d6052 保养计划初始化、巡检工单初始化
zhaoxiaolin d80fe972b3 原料检验任务
shaoyong c67c7a464d 修改物料检验项目实体
wws 8c3829be4d Merge remote-tracking branch 'origin/master'
wws a6d04164ec 1
zhaoxiaolin db3192e9a1 增加排序字段
wws 9c65126191 Merge remote-tracking branch 'origin/master'
wws 4cac17b9bb 巡检计划优化
A0010407 dd8a332ae6 报修+维修工单
wws 08879199ae Merge remote-tracking branch 'origin/master'
wws 6f33aec08c 检查项删除检验逻辑
shaoyong eec6231915 Merge remote-tracking branch 'origin/master'
zhaoxiaolin 6551e07899 质量系统-检验任务管理2
shaoyong 40b350ac8b Merge remote-tracking branch 'origin/master'
zhaoxiaolin 34aad9a2bf 质量系统-检验任务管理1
wws ac2f99c2c7 巡检计划修改+删除
wws 411e562832 Merge remote-tracking branch 'origin/master'
wws 6bde4f4df9 巡检计划修改初始化
ShiChangzhou 78c069cae9 解决sap打包发版问题
wws 435e7adcd4 巡检计划新增接口初始化
shaoyong b47919426d Merge remote-tracking branch 'origin/master'
shaoyong 579a482c85 物料检验项目维护
wws 38270b9b0a 巡检计划
wws ac78b175ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java
#	op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
wws 33a6a48497 Merge remote-tracking branch 'origin/master'
wws e56dc7446b 巡检计划