 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 |
|
|
lym
|
6f5bd90c0d
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-23 15:44:44 +08:00 |
|
|
lym
|
79f011c2df
|
xml数据验证
|
2024-09-23 15:44:36 +08:00 |
|
|
gaoqr
|
5dbd4c8742
|
微服务配置调整：1、移除微服务部分无用配置，规范配置；2、报表微微服务增加支持动态数据源/多租户、增加支持自定义banner控制台输出；
|
2024-09-18 16:53:02 +08:00 |
|
|
lym
|
7493703f34
|
es字段修改
|
2024-09-18 11:18:31 +08:00 |
|
|
lym
|
ef8654f946
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-14 16:31:52 +08:00 |
|
|
lym
|
e899eb2fea
|
工作台接口修改
|
2024-09-14 16:31:38 +08:00 |
|
|
gaoqr
|
8c0a3ecd10
|
分析页统计：生产单/排单数量、平方数统计接口回调数据格式修改为echarts标准，解决返回map自动根据key排序的问题
|
2024-09-14 12:04:05 +08:00 |
|
|
liuzhaotian
|
e772e10d6c
|
机台模板是否发布，是否可用字段更新
|
2024-09-13 09:29:52 +08:00 |
|
|
liuzhaotian
|
6e3231888d
|
排单分页缺少参数增加
|
2024-09-12 16:25:44 +08:00 |
|
|
liuzhaotian
|
2f4b44f495
|
生产单板材表实体类字段增加，修改排单分页按创建时间排序
|
2024-09-12 16:15:45 +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 |
|
|
gaoqr
|
80de6b8aab
|
Merge remote-tracking branch 'origin/main'
|
2024-09-10 18:28:40 +08:00 |
|
|
gaoqr
|
e7192ff6cd
|
禅道问题修复：1、组织套餐允许超管操作；2、角色权限修改触发角色下用户的token缓存删除；3、网关checktoken移除本地缓存，直接查feignapi；4、order_goods的goods_id转为字符串类型的相关代码适配；
|
2024-09-10 18:28:34 +08:00 |
|
|
lym
|
c3a471276a
|
xml导入-修改
|
2024-09-10 17:53:13 +08:00 |
|
|
lym
|
433e6825e5
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-10 15:47:58 +08:00 |
|
|
lym
|
b7acf4d436
|
xml导入
|
2024-09-10 15:47:46 +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 |
|
|
gaoqr
|
40b64b0600
|
Merge remote-tracking branch 'origin/main'
|
2024-09-05 12:20:53 +08:00 |
|
|
gaoqr
|
72c418544c
|
1、报表基础模块：内置模板相关的操作权限限制、新增模板名称唯一性限制；2、分析页统计：排单面积统计关联表修改；
|
2024-09-05 12:20:46 +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 |
|
|
lym
|
a38c2ece52
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-04 12:54:41 +08:00 |
|
|
lym
|
193d3df939
|
bug修改
|
2024-09-04 12:54:28 +08:00 |
|
|
liuzhaotian
|
eb0f511d8b
|
机台授权接口-新需求更改
|
2024-09-03 15:52:10 +08:00 |
|
|
liuzhaotian
|
954ad9b75a
|
禅道438，395Bug修改，未排单查询条件补全
|
2024-09-03 15:27:04 +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 |
|
|
lym
|
d46dd943e7
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-02 18:00:22 +08:00 |
|
|
lym
|
aff4212045
|
配件带分组信息获取
|
2024-09-02 18:00:12 +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 |
|
|
lym
|
7fba202f59
|
生产单管理相关接口调整
|
2024-09-02 17:37:22 +08:00 |
|
|
lym
|
0bea56dd27
|
bug修改
|
2024-09-02 11:52:27 +08:00 |
|
|
lym
|
e5506de32b
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-08-30 16:20:40 +08:00 |
|
|
lym
|
f4f6e1d641
|
第三方接口连接修改
|
2024-08-30 16:20:33 +08:00 |
|
|
gaoqr
|
6107498a22
|
Merge remote-tracking branch 'origin/main'
|
2024-08-29 17:39:45 +08:00 |
|