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
911 Commits 2 Branches 1 Tag
14fdac7ea8a74d87eb3e17e91069e2e31ea7de5f
Commit Graph
470 Commits
Author SHA1 Message Date
liuzhaotian 5181881feb Token为空状态判断 2024-06-14 16:18:52 +08:00
liuzhaotian 350c6c940a executor模块查询新增组织ID，删除排单接口逻辑修改 2024-06-14 15:46:25 +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
gaoqr d49a78d4ce Revert "机台，标签-配置数据压缩" 
This reverts commit 6b861b4ea4.
 2024-06-11 17:40:40 +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
lym ee5e6e0ccd Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-06-11 10:04:18 +08:00
lym 2e1c673be2 余料库接口完善修改 2024-06-11 10:04:09 +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
gaoqr 9c303e6354 1、枚举统一魔法值 
2、错误码规范
3、部分sql语句增加条件走索引，mycat语法修正
 2024-06-07 15:22:12 +08:00
lym 1d5c0dd0de 预料管理修改1 2024-06-06 09:25:27 +08:00
lym af1d7f9402 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-06-04 16:50:36 +08:00
lym 026b761c29 报表导出1 2024-06-04 16:50:28 +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
lym 671d3701e4 造型数据修改 2024-05-30 17:41:37 +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
lym e191888693 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-05-28 18:17:26 +08:00
lym a2e57e91e7 文件上产下载修改 2024-05-28 18:17:14 +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
lym 924da20fe7 修改生产单状态 2024-05-27 18:08:50 +08:00
lym d57083991d 修改接口问题 2024-05-27 10:11:44 +08:00
lym 902d62e17a bug解决 2024-05-27 09:19:37 +08:00
lym a13c17ec3b bug修改 2024-05-27 09:14:09 +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
lym 9efeddba6c Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-05-21 17:41:45 +08:00
lym 3cb6d5d3b4 bug修改 2024-05-21 17:41:35 +08:00
liuzhaotian 7ba43ff5b9 获取生产单数据源-小板列表参数添加 2024-05-21 16:55:04 +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
lym 7955e9071d Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-05-20 17:01:25 +08:00
lym f1f79e18bd bug修改 2024-05-20 17:01:11 +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
lym 7553f1d2d7 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-05-17 18:05:11 +08:00