 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 |
|
|
lym
|
283d46e492
|
生产单管理更新还原、作废等接口
|
2024-06-14 17:08:07 +08:00 |
|
|
lym
|
2c58e73d7c
|
生产单管理更新还原等接口
|
2024-06-14 16:55:43 +08:00 |
|
|
liuzhaotian
|
350c6c940a
|
executor模块查询新增组织ID，删除排单接口逻辑修改
|
2024-06-14 15:46:25 +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 |
|
|
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
|
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 |
|
|
lym
|
1d5c0dd0de
|
预料管理修改1
|
2024-06-06 09:25:27 +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 |
|
|
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
|
ef05a31264
|
生产工序，打包接口，参数修改
|
2024-06-03 17:15:17 +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 |
|
|
lym
|
f1f79e18bd
|
bug修改
|
2024-05-20 17:01:11 +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 |
|
|
lym
|
1aa6626e56
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-05-11 10:23:53 +08:00 |
|
|
lym
|
3cef4142fe
|
生产单管理
|
2024-05-11 10:23:46 +08:00 |
|
|
liuzhaotian
|
643e0ee3a0
|
生产工序代码-打包接口修改
|
2024-05-10 16:27:43 +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 |
|
|
yangsb
|
a79935e709
|
处理manage编译失败
|
2024-05-08 15:25:10 +08:00 |
|
|
yangsb
|
826a7a333e
|
去除manage 的job依赖
|
2024-05-08 15:16:26 +08:00 |
|
|
liuzhaotian
|
ed6b6c5052
|
生产工序代码-生产工序-工序板件信息查看
|
2024-05-08 11:05:47 +08:00 |
|
|
liuzhaotian
|
0ab10aec86
|
生产工序代码-生产工序-查看板件信息修改
|
2024-05-07 19:27:30 +08:00 |
|
|
liuzhaotian
|
10ae0caf1f
|
生产工序代码-生产工序新增查询当前工序信息
|
2024-05-07 17:10:09 +08:00 |
|
|
liuzhaotian
|
f8feff618f
|
生产工序代码-生产工序参数修改
|
2024-05-07 16:07:53 +08:00 |
|
|
liuzhaotian
|
cb987c6ec5
|
生产工序代码-生产工序修改
|
2024-05-07 11:04:37 +08:00 |
|
|
liuzhaotian
|
2e48b02237
|
生产工序代码-查询生产单工序组状态代码修改
|
2024-04-30 15:07:56 +08:00 |
|
|
lym
|
d3f84b08f1
|
bug修改
|
2024-04-28 20:02:19 +08:00 |
|
|
lym
|
79d271d7bb
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-04-28 16:14:14 +08:00 |
|
|
lym
|
95e6477f28
|
数据结构修改
|
2024-04-28 16:14:06 +08:00 |
|
|
liuzhaotian
|
63fe75974a
|
生产工序代码-语音代码修改-DLL读取文件临时去除
|
2024-04-28 15:11:29 +08:00 |
|
|
liuzhaotian
|
c7f1be2a15
|
生产工序代码-语音参数-代码修改
|
2024-04-28 14:55:01 +08:00 |
|