447 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
liuzhaotian	7862c8188c	新增排单-板材分组接口Bug修改	2024-07-04 16:06:38 +08:00
liuzhaotian	b0d4dc684d	新增排单-板材分组接口修改	2024-07-04 15:26:49 +08:00
liuzhaotian	3d7669a114	余料入库权限问题修改	2024-07-03 15:13:27 +08:00
liuzhaotian	0a364a2ec0	Merge remote-tracking branch 'origin/main'	2024-07-03 11:45:13 +08:00
liuzhaotian	49a88b2e87	优化生产权限修改，新增空小板Bug修改	2024-07-03 11:44:58 +08:00
lym	c80847eb48	生产单删除改为物理删除	2024-07-03 11:40:13 +08:00
lym	b3fe53fbbc	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-02 17:45:58 +08:00
lym	0fbb2cf76b	配件汇总、板材库查询修改	2024-07-02 17:45:50 +08:00
liuzhaotian	22c430ddf4	结束开料接口参数修改	2024-07-02 17:07:26 +08:00
liuzhaotian	3a5d688304	Merge remote-tracking branch 'origin/main' ... # Conflicts: # cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java	2024-07-02 16:14:49 +08:00
liuzhaotian	9c6ed3c68d	新增排单-板材分组接口新增；优化生产新增小板接口新增	2024-07-02 16:13:05 +08:00
lym	5418cfdbdf	余料库新增纹理字段	2024-07-02 11:17:18 +08:00
lym	548b976dc6	生产单添加空单状态以及空单相关修改1	2024-07-01 17:17:00 +08:00
lym	b326d15605	生产单添加空单状态以及空单相关修改	2024-07-01 17:05:56 +08:00
liuzhaotian	3aebaf3cb3	204机台模板异常处理	2024-06-29 19:12:24 +08:00
liuzhaotian	3bcb689952	204打包分页异常处理2.0	2024-06-29 18:59:02 +08:00
liuzhaotian	5cb94b9afc	204打包分页异常处理	2024-06-29 18:42:16 +08:00
liuzhaotian	e46faca8d7	Merge remote-tracking branch 'origin/main'	2024-06-29 18:29:31 +08:00
liuzhaotian	30f394ef21	排单优先级更改-排单分页去除重复数据	2024-06-29 18:29:07 +08:00
lym	e7a8afd4f6	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-06-29 17:36:16 +08:00
lym	c990627f36	余料库逻新增辑修改	2024-06-29 17:36:10 +08:00
liuzhaotian	01c02bc6cc	分页打包数据对应修正-新增排单：板材分组接口新增	2024-06-29 16:13:03 +08:00
liuzhaotian	d491c6d796	Merge remote-tracking branch 'origin/main'	2024-06-29 10:16:01 +08:00
liuzhaotian	6e1e0307d4	打包-以打包板材过滤	2024-06-29 10:15:50 +08:00
gaoqr	07165ab343	Merge remote-tracking branch 'origin/main'	2024-06-28 18:58:25 +08:00
gaoqr	db515d913c	权限问题修复：内置角色分配用户的userole指向所选机构	2024-06-28 18:58:15 +08:00
lym	7454908597	余料库逻辑修改，柜体删除修改1	2024-06-28 18:53:52 +08:00
lym	0b6ffa3500	余料库逻辑修改，柜体删除修改	2024-06-28 18:52:29 +08:00
gaoqr	9833ee28c8	infra微服务dev配置文件nacos信息修改	2024-06-28 17:44:20 +08:00
liuzhaotian	4303483f87	Merge remote-tracking branch 'origin/main'	2024-06-28 17:12:53 +08:00
liuzhaotian	a4342d0126	禅道Bug修改	2024-06-28 17:12:21 +08:00
gaoqr	8a6b25be02	bug#174 用户管理>新增用户，提示信息优化	2024-06-28 17:06:35 +08:00
gaoqr	4c3e61f125	权限问题修复： ... 1、角色权限日志提示优化； 2、修复菜单增删改清理缓存，实时生效；	2024-06-28 16:55:37 +08:00
gaoqr	68427b0108	Merge remote-tracking branch 'origin/main'	2024-06-28 14:35:02 +08:00
gaoqr	6aff54a3a5	权限问题修复： ... 1、系统/基础管理中的标签设计权限串修改； 2、角色菜单授权清空MENU_ROLE_ID_LIST:*:菜单id，角色分配用户清空USER_ROLE_ID_LIST:*:用户id缓存，解决内置角色修改权限内容无法立即生效；	2024-06-28 14:34:53 +08:00
liuzhaotian	9d3682a3f9	排单管理-新增排单Bug修改	2024-06-28 10:34:16 +08:00
liuzhaotian	a1639989f1	新增排单查询Bug修改	2024-06-27 19:42:33 +08:00
liuzhaotian	32961ac069	Merge remote-tracking branch 'origin/main'	2024-06-27 19:13:58 +08:00
liuzhaotian	abe876f872	禅道排单Bug修改	2024-06-27 19:13:46 +08:00
gaoqr	c728fac6fb	排单管理-余料入库的@PreAuthorize权限串修改	2024-06-27 17:59:12 +08:00
gaoqr	9a79ef13b4	Merge remote-tracking branch 'origin/main'	2024-06-27 16:28:19 +08:00
gaoqr	de423d9b75	排单管理-余料入库的@PreAuthorize权限串修改	2024-06-27 16:28:02 +08:00
liuzhaotian	93d4312c65	Merge remote-tracking branch 'origin/main'	2024-06-27 14:02:18 +08:00
liuzhaotian	191e8dfff1	打包查询-返回参数增加	2024-06-27 14:02:01 +08:00
gaoqr	60178a2e3d	排单管理-保存优化的@PreAuthorize权限串修改	2024-06-27 11:38:29 +08:00
liuzhaotian	b4da805924	Merge remote-tracking branch 'origin/main'	2024-06-26 19:09:00 +08:00
liuzhaotian	1083e75aa4	新增排单-打包查询-工序加工bug修改	2024-06-26 19:08:41 +08:00
lym	7f7ac18ed3	板材纹路字段修改	2024-06-26 17:51:26 +08:00
liuzhaotian	40b88b7856	Merge remote-tracking branch 'origin/main'	2024-06-26 14:56:28 +08:00
liuzhaotian	8e5d71bf4b	基础配置权限修改，禅道-模糊，工序Bug修改	2024-06-26 14:56:15 +08:00