 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 |
|
 lym
|
280beb808a
|
备注信息调整
|
2024-06-25 09:12:43 +08:00 |
|
|
gaoqr
|
03de668d9a
|
1、生产单导入日志标签修改；
2、系统加载菜单增加组织管理员和普通人的判断；
3、角色菜单授权增加organid和角色的organid统一的处理，解决前端没有传organid导致rolemenu本机构人看不到的情况；
|
2024-06-24 18:15:02 +08:00 |
|
|
lym
|
51a7144d21
|
bug修改异形板数2
|
2024-06-24 10:19:02 +08:00 |
|
|
lym
|
2c581694ad
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-06-24 10:13:18 +08:00 |
|
|
lym
|
ee7a0deac2
|
bug修改异形板数
|
2024-06-24 10:13:09 +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 |
|
|
gaoqr
|
8d67539064
|
Merge remote-tracking branch 'origin/main'
|
2024-06-22 09:56:17 +08:00 |
|
|
gaoqr
|
564896a8f5
|
生产单管理导入问题修复：
1、增加type下模板文件打包到外部，代码通过"包路径/type"进行读取，适配本地环境；
|
2024-06-22 09:55:52 +08:00 |
|
|
lym
|
3b8b2dcfd5
|
工序修改1.2
|
2024-06-22 09:21:32 +08:00 |
|
|
lym
|
8c8b82c65f
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-06-22 09:15:13 +08:00 |
|
|
lym
|
a14d1594e8
|
工序修改
|
2024-06-22 09:15:02 +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 |
|
|
gaoqr
|
64051e9919
|
生产单管理导入问题修复：
1、增加type下模板文件打包到外部，代码通过"包路径/execFile"进行读取；
2、修改文件分隔符自适应；
|
2024-06-21 16:23:59 +08:00 |
|
|
lym
|
b2cffad9cf
|
配件成倍、多工序组、sql语句修正1
|
2024-06-21 12:00:38 +08:00 |
|
|
lym
|
4fdceb11c4
|
配件成倍、多工序组、sql语句修正
|
2024-06-21 11:57:07 +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 |
|
|
lym
|
d8c3f185bc
|
新增备注es2
|
2024-06-19 18:00:28 +08:00 |
|
|
lym
|
b6a9e13ee0
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-06-19 17:44:28 +08:00 |
|
|
lym
|
24dc1f728f
|
新增备注es
|
2024-06-19 17:44:19 +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 |
|
|
gaoqr
|
7523dab74d
|
排单管理中的@PreAuthorize权限串修改
|
2024-06-19 16:50:21 +08:00 |
|
|
gaoqr
|
5d29655aba
|
生产单管理中的@PreAuthorize权限串修改
|
2024-06-19 16:15:57 +08:00 |
|
|
lym
|
ebd9bfec25
|
plateNo修改
|
2024-06-19 15:48:00 +08:00 |
|
|
gaoqr
|
fbd71fd03a
|
生产单管理中的@PreAuthorize权限串修改
|
2024-06-19 11:52:39 +08:00 |
|
|
liuzhaotian
|
c64538ed1f
|
多个订单查询板材，计件工资查询接口修改
|
2024-06-18 17:17:54 +08:00 |
|
|
lym
|
fcabc10e6d
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-06-18 10:08:12 +08:00 |
|
|
lym
|
82939e5ac5
|
修改传参类型
|
2024-06-18 10:08:04 +08:00 |
|
|
gaoqr
|
6d9a9a602f
|
Merge remote-tracking branch 'origin/main'
|
2024-06-17 18:48:06 +08:00 |
|
|
gaoqr
|
f0792baff4
|
主要微服务（gateway、system、mgn、exec）打包方式修改：
1、支持根据profile打包不同配置在jar外；
2、依赖lib打包在jar外；
3、增加test相关配置；
|
2024-06-17 18:47:52 +08:00 |
|
|
lym
|
6d7b76894e
|
工序名校验修改
|
2024-06-17 18:11:42 +08:00 |
|
|
lym
|
724bb7e9e0
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-06-17 16:07:38 +08:00 |
|
|
lym
|
387de1e86a
|
改为orders
|
2024-06-17 16:07:29 +08:00 |
|
|
liuzhaotian
|
b4b55cc5d2
|
工序加工Bug修改
|
2024-06-17 14:12:33 +08:00 |
|
|
liuzhaotian
|
d0a4f5b89b
|
开料排单Bug修改
|
2024-06-14 18:44:08 +08:00 |
|
|
lym
|
283d46e492
|
生产单管理更新还原、作废等接口
|
2024-06-14 17:08:07 +08:00 |
|
|
lym
|
2c58e73d7c
|
生产单管理更新还原等接口
|
2024-06-14 16:55:43 +08:00 |
|
|
liuzhaotian
|
0d25e7cea3
|
排单异常修改
|
2024-06-14 16:40:56 +08:00 |
|
|
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 |
|