 gaoqr
|
8b6e329a80
|
Merge remote-tracking branch 'origin/main'
|
2024-06-17 16:28:26 +08:00 |
|
|
gaoqr
|
cd30ac6419
|
gateway打包方式修改test
|
2024-06-17 16:28:13 +08:00 |
|
 lym
|
724bb7e9e0
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-06-17 16:07:38 +08:00 |
|
|
lym
|
387de1e86a
|
改为orders
|
2024-06-17 16:07:29 +08:00 |
|
|
gaoqr
|
c9c1b9f4e7
|
Revert "gateway打包方式修改test"
This reverts commit 6a9d313374.
|
2024-06-17 15:20:56 +08:00 |
|
|
gaoqr
|
31b9dbe896
|
Merge remote-tracking branch 'origin/main'
|
2024-06-17 15:18:30 +08:00 |
|
|
gaoqr
|
6a9d313374
|
gateway打包方式修改test
|
2024-06-17 15:18:24 +08:00 |
|
|
liuzhaotian
|
4c078ceae4
|
Merge remote-tracking branch 'origin/main'
|
2024-06-17 14:12:48 +08:00 |
|
|
liuzhaotian
|
b4b55cc5d2
|
工序加工Bug修改
|
2024-06-17 14:12:33 +08:00 |
|
|
gaoqr
|
2c5e3e7628
|
1、premission -> permission命名问题修复；
2、新增用户管理中给用户授角色通知刷新本地缓存；
3、角色管理超管查询列表增加内置角色、角色分配用户弹窗在超管不选择机构的情况下只查看超管所在机构的用户
|
2024-06-17 10:03:25 +08:00 |
|
|
liuzhaotian
|
d0a4f5b89b
|
开料排单Bug修改
|
2024-06-14 18:44:08 +08:00 |
|
|
lym
|
283d46e492
|
生产单管理更新还原、作废等接口
|
2024-06-14 17:08:07 +08:00 |
|
|
lym
|
2c58e73d7c
|
生产单管理更新还原等接口
|
2024-06-14 16:55:43 +08:00 |
|
|
gaoqr
|
8f82ff3ab0
|
Merge remote-tracking branch 'origin/main'
|
2024-06-14 16:41:36 +08:00 |
|
|
gaoqr
|
84eb7178ae
|
补充：登录获取角色缓存时上下文中的机构id
|
2024-06-14 16:41:17 +08:00 |
|
|
liuzhaotian
|
0d25e7cea3
|
排单异常修改
|
2024-06-14 16:40:56 +08:00 |
|
|
liuzhaotian
|
5181881feb
|
Token为空状态判断
|
2024-06-14 16:18:52 +08:00 |
|
|
liuzhaotian
|
e394f35093
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/oauth2/OAuth2TokenServiceImpl.java
|
2024-06-14 15:50:49 +08:00 |
|
|
liuzhaotian
|
350c6c940a
|
executor模块查询新增组织ID，删除排单接口逻辑修改
|
2024-06-14 15:46:25 +08:00 |
|
|
gaoqr
|
252d9e200e
|
1、access_token多级缓存同时失效下的刷新处理；
2、loginUser整体用utf-8编码处理中文乱码；
3、角色用sort排序；
|
2024-06-14 11:41:26 +08:00 |
|
|
gaoqr
|
69a679ff77
|
1、菜单权限问题修复；
2、增加修改菜单权限刷新本地缓存；
|
2024-06-13 16:38:17 +08:00 |
|
|
liuzhaotian
|
e8e2052be6
|
标签错误修改
|
2024-06-13 10:51:57 +08:00 |
|
|
liuzhaotian
|
90aeeb35a4
|
生产工序查询SQL增加组织ID,事务添加，包裹表名修改
|
2024-06-13 10:44:34 +08:00 |
|
|
liuzhaotian
|
40b78e6fcd
|
排单Bug修改-生产工序查询SQL增加组织ID
|
2024-06-12 10:49:26 +08:00 |
|
|
liuzhaotian
|
f2c4b1f575
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/OrganIdUtils.java
|
2024-06-11 18:12:27 +08:00 |
|
|
liuzhaotian
|
660d2ca98f
|
错误
|
2024-06-11 18:11:52 +08:00 |
|
|
gaoqr
|
d49a78d4ce
|
Revert "机台，标签-配置数据压缩"
This reverts commit 6b861b4ea4.
|
2024-06-11 17:40:40 +08:00 |
|
|
liuzhaotian
|
0e595b66a0
|
Merge remote-tracking branch 'origin/main'
|
2024-06-11 16:39:23 +08:00 |
|
|
liuzhaotian
|
6b861b4ea4
|
机台，标签-配置数据压缩
|
2024-06-11 16:39:01 +08:00 |
|
|
lym
|
ee5e6e0ccd
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-06-11 10:04:18 +08:00 |
|
|
lym
|
2e1c673be2
|
余料库接口完善修改
|
2024-06-11 10:04:09 +08:00 |
|
|
liuzhaotian
|
5de9bff802
|
错误修改-2.0
|
2024-06-11 09:45:02 +08:00 |
|
|
liuzhaotian
|
db8a1cc6ed
|
错误修改
|
2024-06-07 18:36:24 +08:00 |
|
|
liuzhaotian
|
6b1277384c
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
# cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
# cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
|
2024-06-07 18:21:31 +08:00 |
|
|
liuzhaotian
|
6d5b232d7a
|
优化生产保存接口-获得生产单数据源接口逻辑修改-新增排单接口逻辑修改
|
2024-06-07 18:18:57 +08:00 |
|
|
gaoqr
|
9c303e6354
|
1、枚举统一魔法值
2、错误码规范
3、部分sql语句增加条件走索引，mycat语法修正
|
2024-06-07 15:22:12 +08:00 |
|
|
lym
|
1d5c0dd0de
|
预料管理修改1
|
2024-06-06 09:25:27 +08:00 |
|
|
liuzhaotian
|
bcbc2d3ab6
|
Merge remote-tracking branch 'origin/main'
|
2024-06-05 09:39:35 +08:00 |
|
|
liuzhaotian
|
09812b8c4e
|
生产工序接口逻辑，参数修改
|
2024-06-05 09:39:19 +08:00 |
|
|
lym
|
af1d7f9402
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-06-04 16:50:36 +08:00 |
|
|
lym
|
026b761c29
|
报表导出1
|
2024-06-04 16:50:28 +08:00 |
|
|
liuzhaotian
|
484debd56d
|
Merge remote-tracking branch 'origin/main'
|
2024-06-03 17:15:49 +08:00 |
|
|
liuzhaotian
|
ef05a31264
|
生产工序，打包接口，参数修改
|
2024-06-03 17:15:17 +08:00 |
|
|
lym
|
671d3701e4
|
造型数据修改
|
2024-05-30 17:41:37 +08:00 |
|
|
liuzhaotian
|
ed7b782f38
|
Merge remote-tracking branch 'origin/main'
|
2024-05-29 14:09:47 +08:00 |
|
|
liuzhaotian
|
62ec2c105a
|
排单接口 - bug和参数修改
|
2024-05-29 14:09:34 +08:00 |
|
|
lym
|
e191888693
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-05-28 18:17:26 +08:00 |
|
|
lym
|
a2e57e91e7
|
文件上产下载修改
|
2024-05-28 18:17:14 +08:00 |
|
|
liuzhaotian
|
ee18dd963e
|
排单接口 - 查询排单分页bug修改-ES查询板件造型数据全部返回
|
2024-05-28 14:56:21 +08:00 |
|
|
liuzhaotian
|
186512c02d
|
Merge remote-tracking branch 'origin/main'
|
2024-05-28 14:32:15 +08:00 |
|