 liuzhaotian
|
9c6ed3c68d
|
新增排单-板材分组接口新增；优化生产新增小板接口新增
|
2024-07-02 16:13:05 +08:00 |
|
|
liuzhaotian
|
01c02bc6cc
|
分页打包数据对应修正-新增排单：板材分组接口新增
|
2024-06-29 16:13:03 +08:00 |
|
 lym
|
7454908597
|
余料库逻辑修改，柜体删除修改1
|
2024-06-28 18:53:52 +08:00 |
|
|
lym
|
0b6ffa3500
|
余料库逻辑修改，柜体删除修改
|
2024-06-28 18:52:29 +08:00 |
|
|
liuzhaotian
|
9d3682a3f9
|
排单管理-新增排单Bug修改
|
2024-06-28 10:34:16 +08:00 |
|
|
liuzhaotian
|
abe876f872
|
禅道排单Bug修改
|
2024-06-27 19:13:46 +08:00 |
|
|
liuzhaotian
|
b4da805924
|
Merge remote-tracking branch 'origin/main'
|
2024-06-26 19:09:00 +08:00 |
|
|
liuzhaotian
|
1083e75aa4
|
新增排单-打包查询-工序加工bug修改
|
2024-06-26 19:08:41 +08:00 |
|
|
lym
|
7f7ac18ed3
|
板材纹路字段修改
|
2024-06-26 17:51:26 +08:00 |
|
|
liuzhaotian
|
8e5d71bf4b
|
基础配置权限修改，禅道-模糊，工序Bug修改
|
2024-06-26 14:56:15 +08:00 |
|
|
liuzhaotian
|
130d293ce5
|
打包分页模糊，工序权限修改
|
2024-06-25 18:04:21 +08:00 |
|
|
gaoqr
|
a3fec229a4
|
新增OrganProperties.superAdminProdOrgIgnoreEnable，配置位置为chenfeng.organ.superadmin-prod-org-ignore-enable，支持配置后在超管的情况下也塞入organid
|
2024-06-25 11:53:56 +08:00 |
|
|
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 |
|
|
lym
|
ee7a0deac2
|
bug修改异形板数
|
2024-06-24 10:13:09 +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 |
|
|
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
|
2720d28706
|
排单接口参数修改，获得生产单数据源新增包裹和配件信息
|
2024-06-19 17:35:19 +08:00 |
|
|
liuzhaotian
|
c64538ed1f
|
多个订单查询板材，计件工资查询接口修改
|
2024-06-18 17:17:54 +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
|
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
|
350c6c940a
|
executor模块查询新增组织ID，删除排单接口逻辑修改
|
2024-06-14 15:46:25 +08:00 |
|
|
liuzhaotian
|
40b78e6fcd
|
排单Bug修改-生产工序查询SQL增加组织ID
|
2024-06-12 10:49:26 +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
|
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
|
026b761c29
|
报表导出1
|
2024-06-04 16:50:28 +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
|
31def6fdf2
|
排单接口 - 查询排单分页bug修改
|
2024-05-28 14:31:24 +08:00 |
|