lym
|
79d271d7bb
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-04-28 16:14:14 +08:00 |
|
lym
|
95e6477f28
|
数据结构修改
|
2024-04-28 16:14:06 +08:00 |
|
liuzhaotian
|
70e410cb6f
|
生产工序代码-错误枚举修改
|
2024-04-28 09:25:58 +08:00 |
|
刘照田
|
b0b1b58821
|
Merge branch 'main' into 'LiuZt'
# Conflicts:
# cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
# cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupService.java
# cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java
|
2024-04-26 09:03:38 +00:00 |
|
yangsb
|
522108aaa8
|
优化获取是否管理员自动的方式,去除登出接口组织id依赖
|
2024-04-26 15:25:03 +08:00 |
|
yangsb
|
a7eff5f294
|
修改mybatis自动插入的creator updater 字段为用户昵称
|
2024-04-25 17:45:18 +08:00 |
|
yangsb
|
2153f13a71
|
处理机台模板权限
|
2024-04-25 14:46:33 +08:00 |
|
lym
|
316d021980
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-04-25 11:09:48 +08:00 |
|
lym
|
82e388372c
|
bug修改
|
2024-04-25 11:09:39 +08:00 |
|
yangsb
|
9d2baef834
|
修改部门负责人字段,添加组织备注字段
|
2024-04-25 09:27:56 +08:00 |
|
lym
|
4430543d06
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-04-24 19:28:29 +08:00 |
|
lym
|
53937f842b
|
bug修改
|
2024-04-24 19:28:21 +08:00 |
|
yangsb
|
2bd039c9d9
|
添加限制本人分配用户角色、设置菜单权限
|
2024-04-23 15:02:58 +08:00 |
|
yangsb
|
c26fabb760
|
处理权限异常
|
2024-04-22 14:42:59 +08:00 |
|
lym
|
4cac05a412
|
板材接口修改
|
2024-04-19 17:35:04 +08:00 |
|
lym
|
3af6472ada
|
板材工序接口修改
|
2024-04-19 14:08:50 +08:00 |
|
yangsb
|
5ff48fa2ed
|
去除前端传递organ-id依赖
|
2024-04-19 11:56:28 +08:00 |
|
yangsb
|
f6738b08d0
|
新增设计默认机台模板接口
|
2024-04-18 16:56:59 +08:00 |
|
yangsb
|
31f50e57f1
|
组织导出、用户导出添加字段
|
2024-04-17 13:44:32 +08:00 |
|
yangsb
|
00016e4c9b
|
1.修改数据源标识的获取途径,由原先从前端传递,到从网关统一传递
|
2024-04-12 14:49:44 +08:00 |
|
yangsb
|
83318aefcf
|
添加机台授权逻辑,修改机台授权的实体类
|
2024-04-12 11:30:19 +08:00 |
|
lym
|
c7810570db
|
detail修改
|
2024-04-11 16:59:21 +08:00 |
|
yangsb
|
2bf29a9356
|
添加设置默认机台模板接口
|
2024-04-11 10:22:44 +08:00 |
|
yangsb
|
8661826538
|
1.新增获取机台与标签详情rpc接口,2.定义获取生产单源数据接口
|
2024-04-09 17:08:10 +08:00 |
|
lym
|
829a1ea877
|
生产单新增逻辑
|
2024-04-08 14:07:22 +08:00 |
|
lym
|
1dfdfedc5a
|
生产单新增逻辑
|
2024-04-08 14:01:24 +08:00 |
|
yangsb
|
33597959e2
|
删除标签添加约束条件
|
2024-04-07 17:00:30 +08:00 |
|
yangsb
|
b0dfc889ff
|
添加查询标签数据源value接口
|
2024-04-03 16:15:21 +08:00 |
|
yangsb
|
f33774d73d
|
新增获取默认机台模板、默认标签模板接口
|
2024-04-02 17:19:31 +08:00 |
|
liuzhaotian
|
443312552f
|
生产工序-查询-分堆-打包代码1.0
|
2024-04-01 10:00:52 +08:00 |
|
lym
|
0f5b920c5e
|
数据文件转换存储修改
|
2024-03-26 17:51:23 +08:00 |
|
lym
|
9a12f5010a
|
板材库修改
|
2024-03-25 11:25:37 +08:00 |
|
lym
|
dd49f8231f
|
生产单新增1
|
2024-03-22 10:42:03 +08:00 |
|
lym
|
2148065876
|
生产单新增
|
2024-03-22 10:34:21 +08:00 |
|
lym
|
d520b18901
|
生产单新增
|
2024-03-13 11:51:57 +08:00 |
|
lym
|
cc536e1b1e
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-03-07 18:33:08 +08:00 |
|
lym
|
cb576a6651
|
工序接口修改
|
2024-03-07 18:32:53 +08:00 |
|
yangshb
|
b59b795b58
|
添加删除排单、作废排单接口
|
2024-03-07 13:55:18 +08:00 |
|
yangshb
|
f6d1d354e6
|
init
|
2024-03-05 11:39:57 +08:00 |
|