Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,641 Commits 2 Branches 1 Tag
2a9e38b8d029f8a83c8c2a60dce0809082d80f82
Commit Graph
1641 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yangsb b6a67406e7 排单中小板查询添加异性、造型过滤 2024-04-29 14:48:05 +08:00
yangsb 6d6765cf9f 未排单的板材生产单板材分页列表接口出入参修改 2024-04-29 13:53:05 +08:00
lym 5b06fca087 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-29 09:22:55 +08:00
lym 5a56d2734c 数据结构修改 2024-04-29 09:22:49 +08:00
yangsb e25acb2125 机台下拉选项接口添加组织id参数 2024-04-29 09:21:01 +08:00
yangsb 2d7dd7cbfb 新增机台下拉选项接口 2024-04-29 09:10:30 +08:00
lym 8bdeb8ae49 bug修改 2024-04-28 20:02:55 +08:00
lym 0d929a06f1 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-28 20:02:23 +08:00
lym d3f84b08f1 bug修改 2024-04-28 20:02:19 +08:00
yangsb 632ff5a0dd 优化批量入库方法，按1000条批量入库 2024-04-28 17:41:52 +08:00
lym e7c74dbb86 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-28 16:59:44 +08:00
lym ac43bf6832 数据结构修改 2024-04-28 16:59:39 +08:00
yangsb c58572a4fb 修改根据排单id获取小板为分页 2024-04-28 16:27:59 +08:00
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 63fe75974a 生产工序代码-语音代码修改-DLL读取文件临时去除 2024-04-28 15:11:29 +08:00
liuzhaotian 3872c063a9 Merge remote-tracking branch 'origin/main' 2024-04-28 14:56:29 +08:00
liuzhaotian c7f1be2a15 生产工序代码-语音参数-代码修改 2024-04-28 14:55:01 +08:00
yangsb ee378e6533 排单分页接口添加字段 2024-04-28 14:53:43 +08:00
yangsb 6abbf2c990 处理用户新增、修改对状态的修改 2024-04-28 14:19:13 +08:00
yangsb dc3f2c854f sql修改 2024-04-28 11:38:22 +08:00
yangsb 29ef237a0b 排单分页添加商品颜色字段 2024-04-28 10:55:35 +08:00
yangsb 115d4e2f27 新增根据排单id获取生产单分页接口 2024-04-28 10:50:58 +08:00
liuzhaotian 70e410cb6f 生产工序代码-错误枚举修改 2024-04-28 09:25:58 +08:00
刘照田 a8380bba60 Merge branch 'LiuZt' into 'main' 
生产工序代码提交

See merge request cf_devdept2/cf_imes_server!2
 2024-04-26 18:47:12 +08:00
yangsb c0084dbc4b 处理token过期导致数据源标识异常 2024-04-26 17:04:20 +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
liuzhaotian 7db670ad0d 生产工序代码 2024-04-26 16:52:47 +08:00
yangsb 522108aaa8 优化获取是否管理员自动的方式，去除登出接口组织id依赖 2024-04-26 15:25:03 +08:00
yangsb 0fb3bca338 修改es索引创建人、修改人字段类型 2024-04-26 14:18:12 +08:00
yangsb 4186fd6cff 处理单元测试代码编译失败 2024-04-26 13:45:39 +08:00
yangsb c911cb444a 处理新增用户的异常 2024-04-26 11:23:16 +08:00
yangsb 83ca67a2df token中添加大型组织参数 2024-04-26 10:22:32 +08:00
yangsb b3c1cf89fc 处理网关header传递中文异常 2024-04-26 10:13:01 +08:00
lym f12ef9e9eb Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-25 19:37:51 +08:00
lym cde7b0269b bug修改 2024-04-25 19:37:43 +08:00
yangsb a7eff5f294 修改mybatis自动插入的creator updater 字段为用户昵称 2024-04-25 17:45:18 +08:00
yangsb b73028b192 组织分页添加套餐名称字段 2024-04-25 15:48:03 +08:00
lym 6caedb1e81 bug修改 2024-04-25 14:51:52 +08:00
lym c7b2c28aa2 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-25 14:47:06 +08:00
lym cc00b46d9a bug修改 2024-04-25 14:46:59 +08:00
yangsb 2153f13a71 处理机台模板权限 2024-04-25 14:46:33 +08:00
yangsb fa5e72328c header 2024-04-25 14:31:18 +08:00
yangsb c360572f5a 处理网关传递header异常 2024-04-25 14:30:45 +08:00
yangsb 992f073d12 用户赋角色、角色配用户添加组织id参数，添加根据角色id查询用户列表接口 2024-04-25 11:40:51 +08:00
lym aa7144a090 bug修改 2024-04-25 11:12:49 +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
yangsb a2e05e7112 修复部分bug 2024-04-25 09:04:35 +08:00