 liuzhaotian
|
30f394ef21
|
排单优先级更改-排单分页去除重复数据
|
2024-06-29 18:29:07 +08:00 |
|
|
liuzhaotian
|
01c02bc6cc
|
分页打包数据对应修正-新增排单：板材分组接口新增
|
2024-06-29 16:13:03 +08:00 |
|
|
liuzhaotian
|
d491c6d796
|
Merge remote-tracking branch 'origin/main'
|
2024-06-29 10:16:01 +08:00 |
|
|
liuzhaotian
|
6e1e0307d4
|
打包-以打包板材过滤
|
2024-06-29 10:15:50 +08:00 |
|
|
liuzhaotian
|
4303483f87
|
Merge remote-tracking branch 'origin/main'
|
2024-06-28 17:12:53 +08:00 |
|
|
liuzhaotian
|
a4342d0126
|
禅道Bug修改
|
2024-06-28 17:12:21 +08:00 |
|
|
liuzhaotian
|
9d3682a3f9
|
排单管理-新增排单Bug修改
|
2024-06-28 10:34:16 +08:00 |
|
|
liuzhaotian
|
a1639989f1
|
新增排单查询Bug修改
|
2024-06-27 19:42:33 +08:00 |
|
|
liuzhaotian
|
32961ac069
|
Merge remote-tracking branch 'origin/main'
|
2024-06-27 19:13:58 +08:00 |
|
|
liuzhaotian
|
abe876f872
|
禅道排单Bug修改
|
2024-06-27 19:13:46 +08:00 |
|
|
liuzhaotian
|
93d4312c65
|
Merge remote-tracking branch 'origin/main'
|
2024-06-27 14:02:18 +08:00 |
|
|
liuzhaotian
|
191e8dfff1
|
打包查询-返回参数增加
|
2024-06-27 14:02:01 +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 |
|
|
liuzhaotian
|
40b88b7856
|
Merge remote-tracking branch 'origin/main'
|
2024-06-26 14:56:28 +08:00 |
|
|
liuzhaotian
|
8e5d71bf4b
|
基础配置权限修改，禅道-模糊，工序Bug修改
|
2024-06-26 14:56:15 +08:00 |
|
|
liuzhaotian
|
5b9ead86d1
|
Merge remote-tracking branch 'origin/main'
|
2024-06-25 18:04:37 +08:00 |
|
|
liuzhaotian
|
130d293ce5
|
打包分页模糊，工序权限修改
|
2024-06-25 18:04:21 +08:00 |
|
|
liuzhaotian
|
a06a1deecf
|
Merge remote-tracking branch 'origin/main'
|
2024-06-25 16:01:40 +08:00 |
|
|
liuzhaotian
|
2f43b11fee
|
修改-根据多个排单号查询板材数据
|
2024-06-25 16:01:18 +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 |
|
|
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 |
|
|
liuzhaotian
|
1b78e29965
|
Merge remote-tracking branch 'origin/main'
|
2024-06-22 09:52:09 +08:00 |
|
|
liuzhaotian
|
103d0bdf1e
|
包裹拆包返回数据修改
|
2024-06-22 09:51:58 +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 |
|
|
liuzhaotian
|
1bca13a0f7
|
Merge remote-tracking branch 'origin/main'
|
2024-06-21 10:12:02 +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 |
|
|
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 |
|
|
liuzhaotian
|
208bd42db7
|
获得机台树Bug修改
|
2024-06-19 10:29:30 +08:00 |
|
|
liuzhaotian
|
58d84d5b7a
|
Merge remote-tracking branch 'origin/main'
|
2024-06-18 19:13:24 +08:00 |
|
|
liuzhaotian
|
168ec904e5
|
工序加工Bug修改
|
2024-06-18 19:13:14 +08:00 |
|
|
liuzhaotian
|
23fce78e83
|
Merge remote-tracking branch 'origin/main'
|
2024-06-18 17:18:08 +08:00 |
|
|
liuzhaotian
|
c64538ed1f
|
多个订单查询板材，计件工资查询接口修改
|
2024-06-18 17:17:54 +08:00 |
|
|
liuzhaotian
|
4c078ceae4
|
Merge remote-tracking branch 'origin/main'
|
2024-06-17 14:12:48 +08:00 |
|
|
liuzhaotian
|
b4b55cc5d2
|
工序加工Bug修改
|
2024-06-17 14:12:33 +08:00 |
|
|
liuzhaotian
|
d0a4f5b89b
|
开料排单Bug修改
|
2024-06-14 18:44:08 +08:00 |
|
|
liuzhaotian
|
0d25e7cea3
|
排单异常修改
|
2024-06-14 16:40:56 +08:00 |
|
|
liuzhaotian
|
5181881feb
|
Token为空状态判断
|
2024-06-14 16:18:52 +08:00 |
|
|
liuzhaotian
|
e394f35093
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/oauth2/OAuth2TokenServiceImpl.java
|
2024-06-14 15:50:49 +08:00 |
|
|
liuzhaotian
|
350c6c940a
|
executor模块查询新增组织ID，删除排单接口逻辑修改
|
2024-06-14 15:46:25 +08:00 |
|
|
liuzhaotian
|
e8e2052be6
|
标签错误修改
|
2024-06-13 10:51:57 +08:00 |
|
|
liuzhaotian
|
90aeeb35a4
|
生产工序查询SQL增加组织ID,事务添加，包裹表名修改
|
2024-06-13 10:44:34 +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 |
|
|
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 |
|
|
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 |
|
|
liuzhaotian
|
bcbc2d3ab6
|
Merge remote-tracking branch 'origin/main'
|
2024-06-05 09:39:35 +08:00 |
|
|
liuzhaotian
|
09812b8c4e
|
生产工序接口逻辑，参数修改
|
2024-06-05 09:39:19 +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 |
|
|
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 |
|
|
liuzhaotian
|
ee18dd963e
|
排单接口 - 查询排单分页bug修改-ES查询板件造型数据全部返回
|
2024-05-28 14:56:21 +08:00 |
|
|
liuzhaotian
|
186512c02d
|
Merge remote-tracking branch 'origin/main'
|
2024-05-28 14:32:15 +08:00 |
|
|
liuzhaotian
|
31def6fdf2
|
排单接口 - 查询排单分页bug修改
|
2024-05-28 14:31:24 +08:00 |
|
|
liuzhaotian
|
7d14c155a8
|
排单接口 -- 查询未排单的生产单列表bug修改，api数据导入异常数据回滚
|
2024-05-24 15:03:09 +08:00 |
|
|
liuzhaotian
|
f247866769
|
获取生产单源数据-优化时的数据参数修改
|
2024-05-22 15:23:50 +08:00 |
|
|
liuzhaotian
|
0873a73196
|
获取生产单源数据-优化时的数据新增随机ID
|
2024-05-22 14:11:59 +08:00 |
|
|
liuzhaotian
|
5fb2084f28
|
造型数据查询数据缺少BUG修改
|
2024-05-22 10:02:27 +08:00 |
|
|
liuzhaotian
|
5ce2a699e4
|
Merge remote-tracking branch 'origin/main'
|
2024-05-21 17:46:58 +08:00 |
|
|
liuzhaotian
|
cc48cf4666
|
ES文档新增开料长-宽
|
2024-05-21 17:46:44 +08:00 |
|
|
liuzhaotian
|
7ba43ff5b9
|
获取生产单数据源-小板列表参数添加
|
2024-05-21 16:55:04 +08:00 |
|
|
liuzhaotian
|
13c4a3842b
|
获取组织ID修改为缓存中获取
|
2024-05-21 11:56:20 +08:00 |
|
|
liuzhaotian
|
2b4051ff9e
|
获得生产单数据源参数修改
|
2024-05-21 10:38:53 +08:00 |
|
|
liuzhaotian
|
01d8ebe45e
|
Merge remote-tracking branch 'origin/main'
|
2024-05-20 17:32:16 +08:00 |
|
|
liuzhaotian
|
f2d7b6dc30
|
MyCat分表Organ_Id字段自动添加-获得生产单数据源参数添加
|
2024-05-20 17:32:00 +08:00 |
|
|
liuzhaotian
|
27eea2dd24
|
优化排单-生产单数据参数修改-孔字段添加
|
2024-05-18 14:19:26 +08:00 |
|
|
liuzhaotian
|
70dece2d79
|
优化排单-生产单数据参数修改2.0
|
2024-05-18 10:48:42 +08:00 |
|
|
liuzhaotian
|
f7971c7209
|
优化排单-生产单数据参数修改
|
2024-05-18 10:01:04 +08:00 |
|
|
liuzhaotian
|
48e6f36719
|
优化排单-生产单全部数据返回
|
2024-05-17 17:45:45 +08:00 |
|
|
liuzhaotian
|
e4859249d3
|
生产单板件-获得生产单板件接口参数修改
|
2024-05-15 16:02:54 +08:00 |
|
|
liuzhaotian
|
5260d7c9a3
|
Merge remote-tracking branch 'origin/main'
|
2024-05-14 16:05:47 +08:00 |
|
|
liuzhaotian
|
24a49e2b97
|
生产单板件-造型信息添加注解
|
2024-05-14 16:05:35 +08:00 |
|
|
liuzhaotian
|
e93ad4d248
|
生产工序代码-打包分页查询接口参数添加
|
2024-05-11 15:41:20 +08:00 |
|
|
liuzhaotian
|
bba9c7f7bc
|
生产工序代码-打包分页查询接口修改
|
2024-05-11 14:22:45 +08:00 |
|
|
liuzhaotian
|
f96e69880c
|
Merge remote-tracking branch 'origin/main'
|
2024-05-11 11:10:51 +08:00 |
|
|
liuzhaotian
|
cb4184fa20
|
生产工序代码-工序板件信息查询
|
2024-05-11 11:10:41 +08:00 |
|
|
liuzhaotian
|
643e0ee3a0
|
生产工序代码-打包接口修改
|
2024-05-10 16:27:43 +08:00 |
|
|
liuzhaotian
|
d9735d3e49
|
生产工序代码-PlateDetail板ID参数修改
|
2024-05-09 17:11:10 +08:00 |
|
|
liuzhaotian
|
94818069cd
|
生产工序代码-排单-新增排单-板件参数，SQL修改
|
2024-05-09 16:15:50 +08:00 |
|
|
liuzhaotian
|
c358e6c680
|
生产工序代码-排单-新增排单-SQL修改
|
2024-05-09 14:25:23 +08:00 |
|
|
liuzhaotian
|
58846c8dca
|
生产工序代码-排单-新增排单
|
2024-05-09 11:51:03 +08:00 |
|
|
liuzhaotian
|
c66efce380
|
生产工序代码-生产工序-工序板件信息-柜体搜索2.0
|
2024-05-08 18:05:24 +08:00 |
|
|
liuzhaotian
|
d8b1574499
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml
# cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/TestController.java
|
2024-05-08 18:04:01 +08:00 |
|
|
liuzhaotian
|
d2a0b45a02
|
生产工序代码-生产工序-工序板件信息-柜体搜索
|
2024-05-08 18:01:34 +08:00 |
|
|
liuzhaotian
|
ed6b6c5052
|
生产工序代码-生产工序-工序板件信息查看
|
2024-05-08 11:05:47 +08:00 |
|
|
liuzhaotian
|
0ab10aec86
|
生产工序代码-生产工序-查看板件信息修改
|
2024-05-07 19:27:30 +08:00 |
|
|
liuzhaotian
|
4905cf9895
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java
|
2024-05-07 17:11:35 +08:00 |
|
|
liuzhaotian
|
10ae0caf1f
|
生产工序代码-生产工序新增查询当前工序信息
|
2024-05-07 17:10:09 +08:00 |
|