218 Commits

Include renames

Author	SHA1	Message	Date
liuzhaotian	954ad9b75a	禅道438，395Bug修改，未排单查询条件补全	2024-09-03 15:27:04 +08:00
liuzhaotian	d7af73a305	分堆打包-翻页Bug修改	2024-09-03 10:43:31 +08:00
lym	2dee958b28	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-08-29 17:36:48 +08:00
lym	fc220e5b83	xml导入-版一	2024-08-29 17:36:39 +08:00
liuzhaotian	2248f89e70	未排单，排单，打包数量接口数据问题修改	2024-08-27 14:37:57 +08:00
liuzhaotian	3509debaf3	跟据新需求修改未排单，已排单，新增排单，优化生产等部分接口，禅道381，363，274Bug修改	2024-08-26 18:28:12 +08:00
lym	c027651b28	超管统计接口50%	2024-08-16 18:13:37 +08:00
lym	47c9332a4a	超管统计接口50%	2024-08-16 18:12:02 +08:00
liuzhaotian	438b90b5fd	Merge remote-tracking branch 'origin/main'	2024-08-16 11:30:11 +08:00
liuzhaotian	97bab4fd24	开料，封边新增连带贴标，钻孔新增-逻辑新增，预打包翻页提示信息更改	2024-08-16 11:29:55 +08:00
lym	4ce3b17212	二版更新-定时任务50%	2024-08-09 09:37:52 +08:00
liuzhaotian	5126fd03d1	预打包，翻页Bug修改	2024-08-07 16:30:41 +08:00
liuzhaotian	42a5b9c6ab	查询多个生产单打包信息-增加包裹ID参数	2024-08-02 10:21:39 +08:00
liuzhaotian	9431178c45	预打包相关接口	2024-08-02 09:09:55 +08:00
lym	f6e72c35b7	bug修改-权限获取	2024-07-26 11:18:37 +08:00
liuzhaotian	738ee2bf73	分页打包接口参数修改，数据源字段key名称更改	2024-07-24 10:53:00 +08:00
liuzhaotian	540e840a8d	新增：机台获取数据源，新增数据源接口	2024-07-24 09:10:56 +08:00
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