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-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
331 Commits 2 Branches 1 Tag
168ec904e5e3e05cf38de2febb1796dc84563b32
Commit Graph
79 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
liuzhaotian 09812b8c4e 生产工序接口逻辑，参数修改 2024-06-05 09:39:19 +08:00
liuzhaotian 484debd56d Merge remote-tracking branch 'origin/main' 2024-06-03 17:15:49 +08:00
liuzhaotian ef05a31264 生产工序，打包接口，参数修改 2024-06-03 17:15:17 +08:00
liuzhaotian ed7b782f38 Merge remote-tracking branch 'origin/main' 2024-05-29 14:09:47 +08:00
liuzhaotian 62ec2c105a 排单接口 - bug和参数修改 2024-05-29 14:09:34 +08:00
liuzhaotian ee18dd963e 排单接口 - 查询排单分页bug修改-ES查询板件造型数据全部返回 2024-05-28 14:56:21 +08:00
liuzhaotian 186512c02d Merge remote-tracking branch 'origin/main' 2024-05-28 14:32:15 +08:00
liuzhaotian 31def6fdf2 排单接口 - 查询排单分页bug修改 2024-05-28 14:31:24 +08:00
liuzhaotian 7d14c155a8 排单接口 -- 查询未排单的生产单列表bug修改，api数据导入异常数据回滚 2024-05-24 15:03:09 +08:00
liuzhaotian f247866769 获取生产单源数据-优化时的数据参数修改 2024-05-22 15:23:50 +08:00
liuzhaotian 0873a73196 获取生产单源数据-优化时的数据新增随机ID 2024-05-22 14:11:59 +08:00
liuzhaotian 5fb2084f28 造型数据查询数据缺少BUG修改 2024-05-22 10:02:27 +08:00
liuzhaotian 5ce2a699e4 Merge remote-tracking branch 'origin/main' 2024-05-21 17:46:58 +08:00
liuzhaotian cc48cf4666 ES文档新增开料长-宽 2024-05-21 17:46:44 +08:00
liuzhaotian 7ba43ff5b9 获取生产单数据源-小板列表参数添加 2024-05-21 16:55:04 +08:00
liuzhaotian 13c4a3842b 获取组织ID修改为缓存中获取 2024-05-21 11:56:20 +08:00
liuzhaotian 2b4051ff9e 获得生产单数据源参数修改 2024-05-21 10:38:53 +08:00
liuzhaotian 01d8ebe45e Merge remote-tracking branch 'origin/main' 2024-05-20 17:32:16 +08:00
liuzhaotian f2d7b6dc30 MyCat分表Organ_Id字段自动添加-获得生产单数据源参数添加 2024-05-20 17:32:00 +08:00
liuzhaotian 27eea2dd24 优化排单-生产单数据参数修改-孔字段添加 2024-05-18 14:19:26 +08:00
liuzhaotian 70dece2d79 优化排单-生产单数据参数修改2.0 2024-05-18 10:48:42 +08:00
liuzhaotian f7971c7209 优化排单-生产单数据参数修改 2024-05-18 10:01:04 +08:00
liuzhaotian 48e6f36719 优化排单-生产单全部数据返回 2024-05-17 17:45:45 +08:00
liuzhaotian e4859249d3 生产单板件-获得生产单板件接口参数修改 2024-05-15 16:02:54 +08:00
liuzhaotian 5260d7c9a3 Merge remote-tracking branch 'origin/main' 2024-05-14 16:05:47 +08:00
liuzhaotian 24a49e2b97 生产单板件-造型信息添加注解 2024-05-14 16:05:35 +08:00
liuzhaotian e93ad4d248 生产工序代码-打包分页查询接口参数添加 2024-05-11 15:41:20 +08:00
liuzhaotian bba9c7f7bc 生产工序代码-打包分页查询接口修改 2024-05-11 14:22:45 +08:00
liuzhaotian f96e69880c Merge remote-tracking branch 'origin/main' 2024-05-11 11:10:51 +08:00
liuzhaotian cb4184fa20 生产工序代码-工序板件信息查询 2024-05-11 11:10:41 +08:00
liuzhaotian 643e0ee3a0 生产工序代码-打包接口修改 2024-05-10 16:27:43 +08:00
liuzhaotian d9735d3e49 生产工序代码-PlateDetail板ID参数修改 2024-05-09 17:11:10 +08:00
liuzhaotian 94818069cd 生产工序代码-排单-新增排单-板件参数，SQL修改 2024-05-09 16:15:50 +08:00
liuzhaotian c358e6c680 生产工序代码-排单-新增排单-SQL修改 2024-05-09 14:25:23 +08:00
liuzhaotian 58846c8dca 生产工序代码-排单-新增排单 2024-05-09 11:51:03 +08:00
liuzhaotian c66efce380 生产工序代码-生产工序-工序板件信息-柜体搜索2.0 2024-05-08 18:05:24 +08:00
liuzhaotian d8b1574499 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml
#	cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/TestController.java
 2024-05-08 18:04:01 +08:00
liuzhaotian d2a0b45a02 生产工序代码-生产工序-工序板件信息-柜体搜索 2024-05-08 18:01:34 +08:00
liuzhaotian ed6b6c5052 生产工序代码-生产工序-工序板件信息查看 2024-05-08 11:05:47 +08:00
liuzhaotian 0ab10aec86 生产工序代码-生产工序-查看板件信息修改 2024-05-07 19:27:30 +08:00
liuzhaotian 4905cf9895 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java
 2024-05-07 17:11:35 +08:00
liuzhaotian 10ae0caf1f 生产工序代码-生产工序新增查询当前工序信息 2024-05-07 17:10:09 +08:00
liuzhaotian 8788eef90d Merge remote-tracking branch 'origin/main' 2024-05-07 16:08:10 +08:00
liuzhaotian f8feff618f 生产工序代码-生产工序参数修改 2024-05-07 16:07:53 +08:00
liuzhaotian acc6d2e431 Merge remote-tracking branch 'origin/main' 2024-05-07 11:04:48 +08:00
liuzhaotian cb987c6ec5 生产工序代码-生产工序修改 2024-05-07 11:04:37 +08:00
liuzhaotian f9a245bbaa Merge remote-tracking branch 'origin/main' 2024-04-30 15:08:08 +08:00
liuzhaotian 2e48b02237 生产工序代码-查询生产单工序组状态代码修改 2024-04-30 15:07:56 +08:00
liuzhaotian 63fe75974a 生产工序代码-语音代码修改-DLL读取文件临时去除 2024-04-28 15:11:29 +08:00
liuzhaotian 3872c063a9 Merge remote-tracking branch 'origin/main' 2024-04-28 14:56:29 +08:00
liuzhaotian c7f1be2a15 生产工序代码-语音参数-代码修改 2024-04-28 14:55:01 +08:00
liuzhaotian 70e410cb6f 生产工序代码-错误枚举修改 2024-04-28 09:25:58 +08:00
liuzhaotian 7db670ad0d 生产工序代码 2024-04-26 16:52:47 +08:00
liuzhaotian ff14836e10 语音播报，动态配置，定时任务，工序代码修改 2024-04-20 16:41:51 +08:00
liuzhaotian ce08ddcaea 生产工序-查询-分堆-打包代码3.0 2024-04-09 09:56:11 +08:00
liuzhaotian 2112536aeb 生产工序-查询-分堆-打包代码2.0 2024-04-08 14:25:48 +08:00
liuzhaotian 443312552f 生产工序-查询-分堆-打包代码1.0 2024-04-01 10:00:52 +08:00