 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 |
|
|
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 |
|