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
931 Commits 2 Branches 1 Tag
b70c101a1d1e42a6a2f65506c330dfaa9f5d52ea
Commit Graph
229 Commits
Author SHA1 Message Date
gaoqr bb5843e320 Merge remote-tracking branch 'origin/main' 2025-01-18 11:56:16 +08:00
gaoqr a8d2d24f96 日志记录优化：全服务支持异步方法、异步配置从job移到web 2025-01-18 11:54:34 +08:00
lym 71339dd4b8 配件修改 2025-01-18 11:26:19 +08:00
liuzhaotian 166ebf430a 新增排单-是否混单判断更改，未排单-板材查询参数更改，优化生产，保存优化结果异常提示补全， 2025-01-16 17:22:00 +08:00
lym 299bb30ffc 错误提示语句修改 2025-01-15 15:32:08 +08:00
lym c23b8aa49b api导入bug修改 2025-01-14 11:28:18 +08:00
lym be33ea6e9c 配件权限配置修改 2024-12-16 09:59:34 +08:00
lym 9d14bb21be bug924修改 2024-12-10 15:30:57 +08:00
lym 586e23d3f9 余料管理相关修改 2024-12-09 14:40:33 +08:00
liuzhaotian e2cc2b6fef 生产单板材造型新增大板等字段，ES板材造型数据压缩保存，标签Bug修改 2024-12-06 16:05:57 +08:00
lym 1a935c91f8 补板完善；修改配件类型匹配，对应异形数量、弧形地脚；bug-826,bug-812修改 2024-12-05 18:03:21 +08:00
lym cfa5f77793 Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server 2024-11-28 11:01:38 +08:00
lym d3847c9745 xml导入修改，新增price，新增孔类型和id 2024-11-28 11:01:22 +08:00
liuzhaotian 5931c21034 生产单新增完成时间，配件过滤" 封边条 "类型 2024-11-25 14:56:52 +08:00
liuzhaotian ff4eccc2f2 新增-智能分线相关接口 2024-11-18 09:17:07 +08:00
lym 1bc9119504 api新增sideModel 2024-11-08 16:51:11 +08:00
lym 7c24a7453c 新增配件管理、板材详情 2024-11-08 09:24:34 +08:00
liuzhaotian df4dfd2b58 分堆打包配件列表过滤 2024-10-30 17:23:47 +08:00
liuzhaotian d77c6964db 分堆打包管理Sonar代码检查问题修改 2024-10-23 17:06:22 +08:00
liuzhaotian 603bd88469 未排单，排单管理Sonar代码检查问题修改 2024-10-22 17:09:10 +08:00
lym f191dc5759 提示语句修改 2024-10-22 15:04:00 +08:00
lym ab2a46a19b Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-10-21 15:06:36 +08:00
lym a77567bf3c bug575修改 2024-10-21 15:06:29 +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
lym 0b1ee27f0a 余料字段校验、用户查询修改 2024-10-17 16:45:53 +08:00
lym 84178b3fbe Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-10-17 10:08:55 +08:00
lym bc489b1a0d 岗位、余料查询修改 2024-10-17 10:08:47 +08:00
liuzhaotian 4ceb952bf0 禅道Bug416修改 2024-10-16 16:05:17 +08:00
lym ef458bf851 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-10-15 16:10:22 +08:00
lym e1aa577bc7 板材、余料字段检验 2024-10-15 16:10:12 +08:00
liuzhaotian f02b9d5c5e manage服务pom文件缺少配置增加 2024-10-15 16:05:28 +08:00
lym 8b6232edbb 板材、余料字段检验 2024-10-15 15:55:15 +08:00
liuzhaotian 6f3bca28b7 开料，打包关联生产单状态修改 2024-10-15 15:49:20 +08:00
gaoqr 71cca5e713 角色管理、板材管理接口入参检查完善 2024-10-14 18:57:04 +08:00
liuzhaotian aaf5c62d8c 禅道Bug：400，356修改 2024-10-12 10:36:58 +08:00
gaoqr 2da653d9fb 1、sonarqube质量修复；2、短信模板增删查询移除短信渠道相关内容； 2024-10-11 16:09:34 +08:00
gaoqr c0cc38c691 sonarqube质量修复 2024-10-09 15:45:08 +08:00
gaoqr 220d0ff28a sonarqube质量修复 2024-10-09 12:04:54 +08:00
gaoqr 73b4051641 sonarqube质量修复 2024-10-08 16:52:56 +08:00
liuzhaotian e5d91f7e22 分堆打包拆包数据正确性修改 2024-09-29 17:43:34 +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
lym 85a004b42c Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-09-24 17:54:16 +08:00
lym 71ce80769a xml字段对应验证 2024-09-24 17:54:08 +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
gaoqr 41a8ed5558 Merge remote-tracking branch 'origin/main' 2024-09-23 16:15:51 +08:00
gaoqr 8168c1dad6 1、新增微服务jar包瘦身配置；2、报表模板导入excel模板接口get->post 2024-09-23 16:15:43 +08:00