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
703 Commits 2 Branches 1 Tag
93adc1a0657c67d8b1e31419dac48ef60a9003ba
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
liuzhaotian 93adc1a065 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
 2024-09-24 15:27:05 +08:00
liuzhaotian 69f8df22d0 新增-组织机台授权接口，机台数据源接口，逻辑更改-柜体删除，还原关联排单，包裹部分数据更改，排单部分异常信息返回补全 2024-09-24 15:25:12 +08:00
liuzhaotian 2ca9d38ce7 Merge remote-tracking branch 'origin/main' 2024-09-13 09:30:08 +08:00
liuzhaotian e772e10d6c 机台模板是否发布，是否可用字段更新 2024-09-13 09:29:52 +08:00
liuzhaotian 6e3231888d 排单分页缺少参数增加 2024-09-12 16:25:44 +08:00
liuzhaotian 8e1f21d6af Merge remote-tracking branch 'origin/main' 2024-09-12 16:16:12 +08:00
liuzhaotian 2f4b44f495 生产单板材表实体类字段增加，修改排单分页按创建时间排序 2024-09-12 16:15:45 +08:00
liuzhaotian 21b1ff55b5 Merge remote-tracking branch 'origin/main' 2024-09-11 17:42:36 +08:00
liuzhaotian 83bacf8f4f 新增机台Bug修改 2024-09-11 17:42:24 +08:00
liuzhaotian 9beaa203e0 打包接口查询性能优化 2024-09-11 17:16:19 +08:00
liuzhaotian 406105ea0f 机台缺少参数增加 2024-09-11 16:18:23 +08:00
liuzhaotian 3dda26469f Merge remote-tracking branch 'origin/main' 2024-09-11 16:13:47 +08:00
liuzhaotian 62026720da 优化生产大板字段类型更改，未排单接口查询速度优化 2024-09-11 16:12:27 +08:00
liuzhaotian c9e78f74ae Merge remote-tracking branch 'origin/main' 2024-09-06 14:32:06 +08:00
liuzhaotian 24e3ddfe09 排单接口按新数据结构查询数据修改 2024-09-06 14:31:45 +08:00
liuzhaotian b1678ccef4 排单数据源-包裹详情数据结构更改-缺少方法参数补全 2024-09-05 11:21:50 +08:00
liuzhaotian 8a718dcbc8 Merge remote-tracking branch 'origin/main' 2024-09-05 11:05:58 +08:00
liuzhaotian 90b0521788 排单数据源-包裹详情数据结构更改-缺少参数增加 2024-09-05 11:05:41 +08:00
liuzhaotian 84cab511ac 排单数据源-包裹详情数据结构更改 2024-09-05 11:04:07 +08:00
liuzhaotian 3e82acd235 修改机台Bug修改 2024-09-03 17:39:53 +08:00
liuzhaotian 8192b19402 错误修改 2024-09-03 16:00:14 +08:00
liuzhaotian a47d2f3c97 机台授权接口-新需求更改-补全方法 2024-09-03 15:53:05 +08:00
liuzhaotian eb0f511d8b 机台授权接口-新需求更改 2024-09-03 15:52:10 +08:00
liuzhaotian aef5e42eeb 部署缺少参数补全 2024-09-03 15:37:43 +08:00
liuzhaotian 954ad9b75a 禅道438，395Bug修改，未排单查询条件补全 2024-09-03 15:27:04 +08:00
liuzhaotian d7af73a305 分堆打包-翻页Bug修改 2024-09-03 10:43:31 +08:00
liuzhaotian 05e68fd9bd Merge remote-tracking branch 'origin/main' 2024-09-02 18:54:37 +08:00
liuzhaotian 890c32371b 排单Bug修改 2024-09-02 18:54:16 +08:00
liuzhaotian 7c1c837ec4 补充缺少参数 2024-09-02 17:49:13 +08:00
liuzhaotian 8d7ce1833d 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/orderGroup/OrderGroupMapper.java
 2024-09-02 17:44:13 +08:00
liuzhaotian 772cbe9970 排单-新数据结构，接口逻辑，参数更改 2024-09-02 17:43:07 +08:00
liuzhaotian 79bb032224 优化生产-修改开料排单权限修改 2024-08-28 17:28:39 +08:00
liuzhaotian 2248f89e70 未排单，排单，打包数量接口数据问题修改 2024-08-27 14:37:57 +08:00
liuzhaotian 8b762745ec Merge remote-tracking branch 'origin/main' 2024-08-26 18:28:51 +08:00
liuzhaotian 3509debaf3 跟据新需求修改未排单，已排单，新增排单，优化生产等部分接口，禅道381，363，274Bug修改 2024-08-26 18:28:12 +08:00
liuzhaotian 907fbead3a Merge remote-tracking branch 'origin/main' 2024-08-19 14:15:38 +08:00
liuzhaotian d01afd3b6b 机台授权去除 2024-08-19 14:15:22 +08:00
liuzhaotian 696b363b1f 机台授权部分接口更改-缺少参数新增 2024-08-16 12:15:30 +08:00
liuzhaotian e277d6cd1e 机台授权部分接口更改 2024-08-16 11:47:00 +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
liuzhaotian a939049345 Merge remote-tracking branch 'origin/main' 2024-08-07 16:30:55 +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 881e87bca4 预打包相关接口-缺少参数补充 2024-08-02 09:12:01 +08:00
liuzhaotian 9431178c45 预打包相关接口 2024-08-02 09:09:55 +08:00
liuzhaotian 355332b23d 获取机台树Bug修改 2024-08-01 17:42:00 +08:00
liuzhaotian a80a33971a 忽略system_machine_brand多组织，系统配置接口修改 2024-08-01 17:07:50 +08:00
liuzhaotian 4cdfbf819a Merge remote-tracking branch 'origin/main' 2024-08-01 14:58:57 +08:00
liuzhaotian 64012ab29a 根据新需求修改机台管理相关接口 2024-08-01 14:58:41 +08:00
liuzhaotian d7d45accf2 Merge remote-tracking branch 'origin/main' 2024-07-24 17:20:38 +08:00
liuzhaotian 9ce3d2e57a 系统配置参数修改，新增空小板错误提示更改 2024-07-24 17:20:26 +08:00
liuzhaotian 320b6966fc Merge remote-tracking branch 'origin/main' 2024-07-24 10:53:13 +08:00
liuzhaotian 738ee2bf73 分页打包接口参数修改，数据源字段key名称更改 2024-07-24 10:53:00 +08:00
liuzhaotian fb6752e05c Merge remote-tracking branch 'origin/main' 2024-07-24 09:11:13 +08:00
liuzhaotian 540e840a8d 新增：机台获取数据源，新增数据源接口 2024-07-24 09:10:56 +08:00
liuzhaotian 86bf4f8cb8 Merge remote-tracking branch 'origin/main' 2024-07-23 14:30:14 +08:00
liuzhaotian 2eb3ca69b4 修改配件列表为全部返回 2024-07-23 14:30:03 +08:00
liuzhaotian 80d623fe51 sonarqube代码检查文件 2024-07-22 11:28:36 +08:00
liuzhaotian 954304d722 Merge remote-tracking branch 'origin/main' 2024-07-22 11:17:31 +08:00
liuzhaotian 87a285c6af 允许外部配件重复，新增预打包接口 2024-07-22 11:17:13 +08:00
liuzhaotian 24d35363f4 新增用户配置-缺少类增加-2.0 2024-07-19 14:53:27 +08:00
liuzhaotian 18b97d273b 新增用户配置-缺少类增加 2024-07-19 14:48:17 +08:00
liuzhaotian d9ca5486ce Merge remote-tracking branch 'origin/main' 2024-07-19 14:44:34 +08:00
liuzhaotian 43f705f602 新增用户配置 2024-07-19 14:44:21 +08:00
liuzhaotian c9788110fb 排单参数修改 2024-07-19 09:40:02 +08:00
liuzhaotian e7447c4a8c Merge remote-tracking branch 'origin/main' 2024-07-18 18:39:30 +08:00
liuzhaotian ccd6a390cc 排单-去除排单号-planNo 2024-07-18 18:39:08 +08:00
liuzhaotian 5f26418d08 Merge remote-tracking branch 'origin/main' 2024-07-17 10:22:05 +08:00
liuzhaotian 1ca74cf233 优化生产-加工组信息Bug修改 2024-07-17 10:21:54 +08:00
liuzhaotian 497cb3c88b 打包状态Bug修改 2024-07-12 18:52:19 +08:00
liuzhaotian e6cd2b9540 打包状态，生产单状态，工序加逻辑修改 2024-07-12 18:44:39 +08:00
liuzhaotian 7b1c85a06d Merge remote-tracking branch 'origin/main' 2024-07-12 14:47:35 +08:00
liuzhaotian ec26101796 解决-计算用板量和优化生产小板重复-参数缺少解决 2024-07-12 14:47:21 +08:00
liuzhaotian 7343b4c5ec 解决-计算用板量和优化生产小板重复 2024-07-12 14:41:41 +08:00
liuzhaotian 96906201be Merge remote-tracking branch 'origin/main' 2024-07-11 17:42:45 +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 89fde5cc29 Merge remote-tracking branch 'origin/main' 2024-07-11 09:55:52 +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
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
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
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
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
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