465 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lym	efe85a5d86	生产单管理-api导入列表修改	2024-07-10 10:00:06 +08:00
lym	c1ed17a672	bug修改-名称修改	2024-07-09 17:49:04 +08:00
liuzhaotian	b5086b450b	机台，标签配置压缩	2024-07-09 15:39:21 +08:00
liuzhaotian	6b7e30e0aa	Merge remote-tracking branch 'origin/main'	2024-07-09 10:58:39 +08:00
liuzhaotian	d28d941680	计算用板量Bug修改	2024-07-09 10:58:23 +08:00
lym	b489b22f30	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-09 09:11:52 +08:00
lym	2d451ac3aa	bug修改-补充	2024-07-09 09:11:44 +08:00
gaoqr	83afd677ef	Merge remote-tracking branch 'origin/main'	2024-07-08 18:45:45 +08:00
gaoqr	1916331591	报表基础模块controller基于swagger调试参数调整	2024-07-08 18:45:38 +08:00
liuzhaotian	094e663fb7	Merge remote-tracking branch 'origin/main'	2024-07-08 18:25:42 +08:00
liuzhaotian	fbb57ab252	机台删除，工序加工，排单加工时间，排单数据筛选Bug修改	2024-07-08 18:25:20 +08:00
lym	587af84fce	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-08 18:11:05 +08:00
lym	0e9108d061	bug修改-余料库	2024-07-08 18:10:54 +08:00
gaoqr	c87ba884b1	权限问题修复：工序加工顶部菜单栏查询工序列表接口增加权限'product:process:query'	2024-07-08 16:29:11 +08:00
gaoqr	03cce64688	1、报表基础内容实现，service单元测试实现，移除report微服务中没用的单元测试内容； ... 2、DefaultDBFieldHandler自动填充处理类中request注入改为上下文获取；	2024-07-08 15:48:17 +08:00
lym	4319d6d340	bug修改	2024-07-08 11:54:15 +08:00
lym	ed3700d8ef	工序组相关问题修改	2024-07-05 09:49:11 +08:00
liuzhaotian	4465f401c8	优化生产新增空小板接口逻辑修改，分页打包接口板材参数修改	2024-07-04 18:37:26 +08:00
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