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
521 Commits 2 Branches 1 Tag
d9999377c90063f599ef9a4f10381dbdbd4fcec6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
liuzhaotian 30f394ef21 排单优先级更改-排单分页去除重复数据 2024-06-29 18:29:07 +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
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
liuzhaotian 9d3682a3f9 排单管理-新增排单Bug修改 2024-06-28 10:34:16 +08:00
liuzhaotian a1639989f1 新增排单查询Bug修改 2024-06-27 19:42:33 +08:00
liuzhaotian 32961ac069 Merge remote-tracking branch 'origin/main' 2024-06-27 19:13:58 +08:00
liuzhaotian abe876f872 禅道排单Bug修改 2024-06-27 19:13:46 +08:00
liuzhaotian 93d4312c65 Merge remote-tracking branch 'origin/main' 2024-06-27 14:02:18 +08:00
liuzhaotian 191e8dfff1 打包查询-返回参数增加 2024-06-27 14:02:01 +08:00
liuzhaotian b4da805924 Merge remote-tracking branch 'origin/main' 2024-06-26 19:09:00 +08:00
liuzhaotian 1083e75aa4 新增排单-打包查询-工序加工bug修改 2024-06-26 19:08:41 +08:00
liuzhaotian 40b88b7856 Merge remote-tracking branch 'origin/main' 2024-06-26 14:56:28 +08:00
liuzhaotian 8e5d71bf4b 基础配置权限修改，禅道-模糊，工序Bug修改 2024-06-26 14:56:15 +08:00
liuzhaotian 5b9ead86d1 Merge remote-tracking branch 'origin/main' 2024-06-25 18:04:37 +08:00
liuzhaotian 130d293ce5 打包分页模糊，工序权限修改 2024-06-25 18:04:21 +08:00
liuzhaotian a06a1deecf Merge remote-tracking branch 'origin/main' 2024-06-25 16:01:40 +08:00
liuzhaotian 2f43b11fee 修改-根据多个排单号查询板材数据 2024-06-25 16:01:18 +08:00
liuzhaotian 9fee8cceee Merge remote-tracking branch 'origin/main' 2024-06-25 09:39:24 +08:00
liuzhaotian c5775f8638 打包接口，工序加工-板材类型查询修改 2024-06-25 09:39:05 +08:00
liuzhaotian 3c9977a9f8 Merge remote-tracking branch 'origin/main' 2024-06-22 09:59:33 +08:00
liuzhaotian 40eb10a021 包裹拆包返回数据修改-2.0 2024-06-22 09:59:21 +08:00
liuzhaotian 1b78e29965 Merge remote-tracking branch 'origin/main' 2024-06-22 09:52:09 +08:00
liuzhaotian 103d0bdf1e 包裹拆包返回数据修改 2024-06-22 09:51:58 +08:00
liuzhaotian 02d207d0c5 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
 2024-06-21 18:27:37 +08:00
liuzhaotian 484826b90a MyCat-SQL语句冲突部分修改 2024-06-21 18:24:05 +08:00
liuzhaotian 1bca13a0f7 Merge remote-tracking branch 'origin/main' 2024-06-21 10:12:02 +08:00
liuzhaotian 1934325f00 工序加工204Bug修改，根据排单ID查询板材信息接口新增 2024-06-21 10:11:38 +08:00
liuzhaotian 3d0c824303 Merge remote-tracking branch 'origin/main' 2024-06-20 16:38:06 +08:00
liuzhaotian ab1384ccd1 打包接口参数修改，工序加工bug修改 2024-06-20 16:34:10 +08:00
liuzhaotian 5acf0b2d6b Merge remote-tracking branch 'origin/main' 2024-06-19 17:35:35 +08:00
liuzhaotian 2720d28706 排单接口参数修改，获得生产单数据源新增包裹和配件信息 2024-06-19 17:35:19 +08:00
liuzhaotian 208bd42db7 获得机台树Bug修改 2024-06-19 10:29:30 +08:00
liuzhaotian 58d84d5b7a Merge remote-tracking branch 'origin/main' 2024-06-18 19:13:24 +08:00
liuzhaotian 168ec904e5 工序加工Bug修改 2024-06-18 19:13:14 +08:00
liuzhaotian 23fce78e83 Merge remote-tracking branch 'origin/main' 2024-06-18 17:18:08 +08:00
liuzhaotian c64538ed1f 多个订单查询板材，计件工资查询接口修改 2024-06-18 17:17:54 +08:00
liuzhaotian 4c078ceae4 Merge remote-tracking branch 'origin/main' 2024-06-17 14:12:48 +08:00
liuzhaotian b4b55cc5d2 工序加工Bug修改 2024-06-17 14:12:33 +08:00
liuzhaotian d0a4f5b89b 开料排单Bug修改 2024-06-14 18:44:08 +08:00
liuzhaotian 0d25e7cea3 排单异常修改 2024-06-14 16:40:56 +08:00
liuzhaotian 5181881feb Token为空状态判断 2024-06-14 16:18:52 +08:00
liuzhaotian e394f35093 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/oauth2/OAuth2TokenServiceImpl.java
 2024-06-14 15:50:49 +08:00
liuzhaotian 350c6c940a executor模块查询新增组织ID，删除排单接口逻辑修改 2024-06-14 15:46:25 +08:00
liuzhaotian e8e2052be6 标签错误修改 2024-06-13 10:51:57 +08:00
liuzhaotian 90aeeb35a4 生产工序查询SQL增加组织ID,事务添加，包裹表名修改 2024-06-13 10:44:34 +08:00
liuzhaotian 40b78e6fcd 排单Bug修改-生产工序查询SQL增加组织ID 2024-06-12 10:49:26 +08:00
liuzhaotian f2c4b1f575 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/OrganIdUtils.java
 2024-06-11 18:12:27 +08:00
liuzhaotian 660d2ca98f 错误 2024-06-11 18:11:52 +08:00
liuzhaotian 0e595b66a0 Merge remote-tracking branch 'origin/main' 2024-06-11 16:39:23 +08:00
liuzhaotian 6b861b4ea4 机台，标签-配置数据压缩 2024-06-11 16:39:01 +08:00
liuzhaotian 5de9bff802 错误修改-2.0 2024-06-11 09:45:02 +08:00
liuzhaotian db8a1cc6ed 错误修改 2024-06-07 18:36:24 +08:00
liuzhaotian 6b1277384c Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
 2024-06-07 18:21:31 +08:00
liuzhaotian 6d5b232d7a 优化生产保存接口-获得生产单数据源接口逻辑修改-新增排单接口逻辑修改 2024-06-07 18:18:57 +08:00
liuzhaotian bcbc2d3ab6 Merge remote-tracking branch 'origin/main' 2024-06-05 09:39:35 +08:00