151 Commits

Include renames

Author	SHA1	Message	Date
liuzhaotian	2eb3ca69b4	修改配件列表为全部返回	2024-07-23 14:30:03 +08:00
lym	30f276c355	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-23 11:09:21 +08:00
lym	a95944a4a0	bug修改-plate	2024-07-23 11:09:13 +08:00
liuzhaotian	87a285c6af	允许外部配件重复，新增预打包接口	2024-07-22 11:17:13 +08:00
lym	6ffcdba99f	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-07-19 16:00:58 +08:00
lym	e0253d3011	板材库去掉价格	2024-07-19 16:00:47 +08:00
liuzhaotian	24d35363f4	新增用户配置-缺少类增加-2.0	2024-07-19 14:53:27 +08:00
liuzhaotian	43f705f602	新增用户配置	2024-07-19 14:44:21 +08:00
liuzhaotian	497cb3c88b	打包状态Bug修改	2024-07-12 18:52:19 +08:00
liuzhaotian	e6cd2b9540	打包状态，生产单状态，工序加逻辑修改	2024-07-12 18:44:39 +08:00
liuzhaotian	7343b4c5ec	解决-计算用板量和优化生产小板重复	2024-07-12 14:41:41 +08:00
liuzhaotian	70e5a394c2	分堆打包Bug修改-2.0	2024-07-11 17:42:33 +08:00
liuzhaotian	786df04d1d	分堆打包Bug修改	2024-07-11 15:55:49 +08:00
liuzhaotian	6ca7c1d5aa	配件列表分页，查询参数修改	2024-07-11 09:55:42 +08:00
liuzhaotian	129f919405	Merge remote-tracking branch 'origin/main'	2024-07-10 18:47:54 +08:00
liuzhaotian	e3b5567acf	机台,标签接口返回错误修改,打包分页接口条件修改	2024-07-10 18:47:39 +08:00
gaoqr	7f7b2522bf	权限问题修复：包裹详情接口关联打包/包裹详情查询权限串	2024-07-09 18:16:46 +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
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	0e9108d061	bug修改-余料库	2024-07-08 18:10:54 +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	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	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	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
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
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
lym	7454908597	余料库逻辑修改，柜体删除修改1	2024-06-28 18:53:52 +08:00
lym	0b6ffa3500	余料库逻辑修改，柜体删除修改	2024-06-28 18:52:29 +08:00
liuzhaotian	a4342d0126	禅道Bug修改	2024-06-28 17:12:21 +08:00
liuzhaotian	9d3682a3f9	排单管理-新增排单Bug修改	2024-06-28 10:34:16 +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