Commit Graph

47 Commits (eacf18a4a822d2893108ffe46c3e821009d857a4)

Author SHA1 Message Date
zhaoxiaolin eacf18a4a8 人员信息同步2.0
zhaoxiaolin 8a0a9b7634 人员信息同步+报工修改
A0010407 2ccd0cab8f 2024-3-20 提交代码有问题
A0010407 264916d073 2024.3.19-3.20 系统模块、定时任务模块-人力资源基础信息部门、岗位定时任务
Yangwl cf3977a0e5 Merge remote-tracking branch 'origin/master'
Yangwl 97dc167cea 计件工资统计
zhaoxiaolin 52a73c37d3 bug修改
Yangwl 01dd5b5629 本地保存
zhaoxiaolin b9df5a579f 人力信息同步
wws 62ee2492fc 数据源分配用户查询BUG解决
A0010407 c1fd8c9c18 用户 微信名+bug
Yangwl cdd852bf07 字段注释
Yangwl 6fb697e5ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
#	op-auth/src/main/resources/bootstrap.yml
#	op-gateway/src/main/resources/bootstrap.yml
#	op-modules/op-mes/push-mes.bat
#	op-modules/op-mes/src/main/resources/bootstrap.yml
#	op-modules/op-sap/src/main/resources/bootstrap.yml
#	op-modules/op-system/src/main/resources/bootstrap.yml
Yangwl cec59e4bc4 烘房看板接口
zhaoxiaolin 15157dd26e 测试版本注册中心修改
zhaoxiaolin c7bfb41867 管理系统报工
zhaoxiaolin e32ee7119b bug修改
zhaoxiaolin 4278e4cb73 bug修改
zhaoxiaolin 42b9c09918 bug修改
zhaoxiaolin 94010d9146 生产过程检验v3
zhaoxiaolin 9d55da3a0b 生产过程检验+手持发版记录
zhaoxiaolin 9bea4d9d6c 工单编码
zhaoxiaolin ccb8a178cb 生产环境
zhaoxiaolin 0a822359bd 数据源
zhaoxiaolin 1b53ac43d9 首页
zhaoxiaolin 139dc3fb4c 日生产报表功能
zhaoxiaolin 5a60b22157 计划-设备路线选择更改;报工定时任务;
zhaoxiaolin c1885b1805 手持质量检验
zhaoxiaolin 76036ee69a 计划bug修改
zhaoxiaolin a5147344fb 新增员工时加数据源权限
zhaoxiaolin 1879d18ba9 数据源规则修改
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
chj 0e7a206b40 MES报废功能
zhaoxiaolin 362f6a167b 计划涉及的接口开发
zhaoxiaolin 95205cd536 微服务添加
Yangwl a72ac03a1e SAP定时任务同步订单
zhaoxiaolin 9a62fbe233 系统管理的部门sql修改;工艺加是否需要首检;
zhaoxiaolin 974dd13455 工厂数据源切换
zhaoxiaolin 616d370067 菜单
zhaoxiaolin 7bbdd00a61 工序1.0
zhaoxiaolin 26ce694217 init sqserver不支持limit
zhaoxiaolin bcea1651cc init3.2SQLserver
zhaoxiaolin fa358163ac init3.2SQLserver
zhaoxiaolin b31faa04df init3.2SQLserver
zhaoxiaolin f4f729febe init3.1
zhaoxiaolin 924c2c14c0 init3.0
zhaoxiaolin 39a6d33464 init