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
881 Commits 2 Branches 1 Tag
f3dc019a484a7af4305dd6a0a8e1e0cc6072c98d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
liuzhaotian 3450c2c19e 生产单，标签缺少参数补充 2024-12-06 16:13:48 +08:00
liuzhaotian e2cc2b6fef 生产单板材造型新增大板等字段，ES板材造型数据压缩保存，标签Bug修改 2024-12-06 16:05:57 +08:00
liuzhaotian 56a7299787 优化生产开料，修改开料状态逻辑增强 2024-11-28 11:42:33 +08:00
liuzhaotian 8f695c765b Merge remote-tracking branch 'origin/main' 2024-11-25 14:59:34 +08:00
liuzhaotian 5931c21034 生产单新增完成时间，配件过滤" 封边条 "类型 2024-11-25 14:56:52 +08:00
liuzhaotian ff4eccc2f2 新增-智能分线相关接口 2024-11-18 09:17:07 +08:00
liuzhaotian df4dfd2b58 分堆打包配件列表过滤 2024-10-30 17:23:47 +08:00
liuzhaotian 2239cfb84f Sonar代码问题修改 2024-10-29 17:19:05 +08:00
liuzhaotian a448070cb9 ES文档点集修改，Sonar序列化问题修改 2024-10-28 13:49:51 +08:00
liuzhaotian bcf97b6bb6 开料关联生产单状态问题修改 2024-10-24 17:10:18 +08:00
liuzhaotian 032745ee54 新增：ES文档数据手动刷新 2024-10-24 10:44:43 +08:00
liuzhaotian d77c6964db 分堆打包管理Sonar代码检查问题修改 2024-10-23 17:06:22 +08:00
liuzhaotian 603bd88469 未排单，排单管理Sonar代码检查问题修改 2024-10-22 17:09:10 +08:00
liuzhaotian 81525de432 缺少信息补充 2024-10-18 10:13:47 +08:00
liuzhaotian f9e7464d85 Merge remote-tracking branch 'origin/main' 2024-10-18 10:13:11 +08:00
liuzhaotian 72383a3608 未排单，排单，打包模块接口入参类型检查完善，异常信息补全 2024-10-18 10:12:41 +08:00
liuzhaotian 70ab1cf90e 机台型号非空判断忽略更新 2024-10-16 18:01:21 +08:00
liuzhaotian 4ceb952bf0 禅道Bug416修改 2024-10-16 16:05:17 +08:00
liuzhaotian f02b9d5c5e manage服务pom文件缺少配置增加 2024-10-15 16:05:28 +08:00
liuzhaotian 6f3bca28b7 开料，打包关联生产单状态修改 2024-10-15 15:49:20 +08:00
liuzhaotian 84c52409f2 排单关联生产单状态修改 2024-10-14 14:04:33 +08:00
liuzhaotian aaf5c62d8c 禅道Bug：400，356修改 2024-10-12 10:36:58 +08:00
liuzhaotian e5d91f7e22 分堆打包拆包数据正确性修改 2024-09-29 17:43:34 +08:00
liuzhaotian 3b6e24e5b6 禅道Bug-530，527解决 2024-09-29 16:45:06 +08:00
liuzhaotian eeafc5f2a6 组织机台授权新增最大数量异常信息提示，排单优化生产ES数据结构余料新增品牌等信息 2024-09-29 14:45:03 +08:00
liuzhaotian bc8cbdf3a2 Merge remote-tracking branch 'origin/main' 2024-09-27 15:43:12 +08:00
liuzhaotian a0734b6f1f 获得机台新增品牌信息，排单，打包补全部分代码逻辑 2024-09-27 15:42:51 +08:00
liuzhaotian 38af1710fb Merge remote-tracking branch 'origin/main' 2024-09-25 10:35:07 +08:00
liuzhaotian e4f71a9fb7 获取数据源增加配件的备注信息，配件信息增加类型等信息 2024-09-25 10:34:48 +08:00
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