WYnneaoapc
|
2ede8c9dfe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
c6c57dd829
|
task `1294-1` 查找workcell的时候需要带上产线
|
5 years ago |
 王杰
|
571ab9bd3e
|
获取打印模版参数修改
|
5 years ago |
gcj
|
3e6ca8d039
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
gcj
|
a1a3d1e838
|
【Bug清单】------------------------------
|
5 years ago |
jenkins
|
7d3ff10acb
|
Jenkins自动合并
|
5 years ago |
 钮海涛
|
06125eab20
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java
|
5 years ago |
|
钮海涛
|
f5181072b5
|
新增表达式录入界面接口
|
5 years ago |
|
钮海涛
|
68bba613e3
|
新增表达式录入界面接口
|
5 years ago |
|
jenkins
|
af9bb85377
|
Jenkins自动合并
|
5 years ago |
|
WYnneaoapc
|
238d0aea3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
efb29aa8f4
|
task `1294-1` 查找workcell的时候需要带上产线
|
5 years ago |
|
钮海涛
|
222e1b020d
|
新增表达式录入界面接口
|
5 years ago |
|
王杰
|
7ca0ac3e5a
|
解决冲突
|
6 years ago |
|
王杰
|
bba25ad2de
|
批量打包model修改
|
6 years ago |
E
|
c7d4253e5e
|
【bug 6872 - 收货、发运看板数据未加载】
|
6 years ago |
|
jenkins
|
6fc8833b01
|
Jenkins自动合并
|
6 years ago |
汪云昊
|
bc5beeba7d
|
添加适配记录索引
|
6 years ago |
|
WYnneaoapc
|
9b8675c904
|
task `1292-1` 新增条码履历字段
|
6 years ago |
|
jenkins
|
0349a43f71
|
Jenkins自动合并
|
6 years ago |
于学杰
|
67b5069c48
|
1. 增加分组提交的配置字段
|
6 years ago |
|
王杰
|
8bb63e3bac
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
1f4a8d6e55
|
【安灯修改枚举】
|
6 years ago |
|
jenkins
|
2c88a30b4d
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
6852153227
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
8dc1513947
|
bug`6897` SOP信息-编辑图片后未显示出图片地址
|
6 years ago |
jokelone
|
2f7f9a233a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
a337f1824f
|
Merge branch 'dev' into test
|
6 years ago |
|
jenkins
|
495d3b1ddc
|
Jenkins自动合并
|
6 years ago |
陈思洁
|
3a353b1539
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
1d5f4b38a4
|
【KT-1282 计划拉动-班次管理】
|
6 years ago |
|
gcj
|
32dccc056c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
6 years ago |
|
gcj
|
1e10bdee0c
|
【坤泰运输管理】
|
6 years ago |
陆卫豪
|
345374354b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
fc5282342f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
ca952d5211
|
bug`6866` 2 打印模板同步
|
6 years ago |
|
jokelone
|
c3ec5fb20f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jenkins
|
1e089c4110
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
056dbaacf2
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
eb5f9610a8
|
【KT-1282 计划拉动-班次管理】
|
6 years ago |
|
jenkins
|
5bd51e2045
|
Jenkins自动合并
|
6 years ago |
|
陈思洁
|
dc8a44df2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
5797ec4b1b
|
新增工位表字段
|
6 years ago |
|
王杰
|
4e866d70e1
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
fcc2b09559
|
【安灯修改枚举】
|
6 years ago |
|
jenkins
|
6d1d66daf3
|
Jenkins自动合并
|
6 years ago |
|
WYnneaoapc
|
f4b50200b2
|
bug`6866` 1 打印模板同步
|
6 years ago |
|
jokelone
|
7e0d27f0f4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
a0780669c3
|
【任务：1287】
|
6 years ago |
zcg
|
032260b9f2
|
[需求：1290，导入excel]
|
6 years ago |