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
|
7955e9071d
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-05-20 17:01:25 +08:00 |
|
lym
|
f1f79e18bd
|
bug修改
|
2024-05-20 17:01:11 +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 |
|
lym
|
7553f1d2d7
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-05-17 18:05:11 +08:00 |
|
lym
|
f936c39cad
|
数据完善
|
2024-05-17 18:05:03 +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 |
|
lym
|
e7fbf3b1c3
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-05-14 16:02:28 +08:00 |
|
lym
|
cc6b56b0cc
|
excel读DO
|
2024-05-14 16:02:21 +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
|
d9735d3e49
|
生产工序代码-PlateDetail板ID参数修改
|
2024-05-09 17:11:10 +08:00 |
|
liuzhaotian
|
94818069cd
|
生产工序代码-排单-新增排单-板件参数,SQL修改
|
2024-05-09 16:15:50 +08:00 |
|
lym
|
f97615bd7a
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-05-09 15:28:46 +08:00 |
|
lym
|
f847b52ba4
|
api数据
|
2024-05-09 15:28:35 +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 |
|
yangsb
|
a79935e709
|
处理manage编译失败
|
2024-05-08 15:25:10 +08:00 |
|
yangsb
|
826a7a333e
|
去除manage 的job依赖
|
2024-05-08 15:16:26 +08:00 |
|
yangsb
|
305828f352
|
修改创建排单的接口参数
|
2024-05-08 15:08:26 +08:00 |
|
yangsb
|
1abca14719
|
新增处理排单号
|
2024-05-08 14:33:05 +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 |
|
yangsb
|
05ea76db59
|
处理编译失败
|
2024-05-07 16:55:45 +08:00 |
|
yangsb
|
48c38949c0
|
处理编译异常
|
2024-05-07 16:54:28 +08:00 |
|
yangsb
|
6a1ae22713
|
新增设置排单优先级接口
|
2024-05-07 16:52:43 +08:00 |
|
yangsb
|
edf06e059d
|
修改、修改排单逻辑
|
2024-05-07 16:36:36 +08:00 |
|
yangsb
|
f3d13533b5
|
处理新增、修改排单的必传字段限制
|
2024-05-07 16:35:05 +08:00 |
|
liuzhaotian
|
8788eef90d
|
Merge remote-tracking branch 'origin/main'
|
2024-05-07 16:08:10 +08:00 |
|
liuzhaotian
|
f8feff618f
|
生产工序代码-生产工序参数修改
|
2024-05-07 16:07:53 +08:00 |
|
yangsb
|
6ab5565fca
|
处理获取未排单的板材生产单板材分页列表接口异常
|
2024-05-07 11:25:48 +08:00 |
|
liuzhaotian
|
acc6d2e431
|
Merge remote-tracking branch 'origin/main'
|
2024-05-07 11:04:48 +08:00 |
|
liuzhaotian
|
cb987c6ec5
|
生产工序代码-生产工序修改
|
2024-05-07 11:04:37 +08:00 |
|
yangsb
|
550e5ca905
|
新增根据生产单id获取未排单的商品分页列表接口
|
2024-05-07 09:01:54 +08:00 |
|