 王杰
|
6b7cfa6659
|
Merge branch 'test' into ext-dev
|
5 years ago |
|
王杰
|
3cd06f5be3
|
pom
|
5 years ago |
许心洁
|
d223ff242d
|
BUG14132 #流程管家在重置之后开启了一个新的流程但是没有重新返回配置项信息，导致前端重置后按钮组件等消失
|
5 years ago |
|
王杰
|
04756b1a6d
|
Merge branch 'test' into dev
|
5 years ago |
 钮海涛
|
52644c1deb
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 years ago |
|
钮海涛
|
f10f13a8de
|
add import field
|
5 years ago |
|
许心洁
|
38e6870f04
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
puxiao.liao
|
a98066dbe8
|
接口增加字段信息
|
5 years ago |
|
王杰
|
96f2f98024
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
431ee97d64
|
同步工单表
|
5 years ago |
|
王杰
|
f4e9bf4603
|
Merge branch 'test' into ext-dev
|
5 years ago |
|
王杰
|
94d38bb175
|
test merge dev
|
5 years ago |
|
王杰
|
aab076838c
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
fe6940b0dc
|
编码规则扩展
|
5 years ago |
joke.wang
|
b505fe8456
|
13858 20027--接口表同步情况报表
|
5 years ago |
|
joke.wang
|
e2a9222b47
|
pcn登陆限制
|
5 years ago |
 曾贞一
|
76079c9bee
|
Merge branch 'test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
|
5 years ago |
|
puxiao.liao
|
485fe13202
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
c880d51c9d
|
修复泰国翻包
|
5 years ago |
|
钮海涛
|
90169cd8b0
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 years ago |
|
钮海涛
|
2ba2314968
|
add import field
|
5 years ago |
|
曾贞一
|
c63df1ed7f
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
5 years ago |
Dominic_Xiao
|
0c9dff6dd8
|
不良品处理根据物料类型查询位置
|
5 years ago |
|
Dominic_Xiao
|
c1eb51dec5
|
缺陷位置新增产品类型字段
|
5 years ago |
|
王杰
|
dbc417269b
|
test merge ext-dev
|
5 years ago |
|
王杰
|
ae70490123
|
sonar
|
5 years ago |
|
王杰
|
03d95e2591
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
b635c10750
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
e66a560661
|
冲突
|
5 years ago |
|
王杰
|
ec3d2f8557
|
pom
|
5 years ago |
|
王杰
|
4644639c2e
|
pom
|
5 years ago |
|
王杰
|
c06902f8de
|
冲突
|
5 years ago |
|
曾贞一
|
462ed4f1de
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
5 years ago |
|
曾贞一
|
7b3ef8f268
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
5 years ago |
|
曾贞一
|
5af6f3ae7f
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
5 years ago |
|
钮海涛
|
7cda94ab0c
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 years ago |
|
钮海涛
|
0b354ef001
|
add import template
|
5 years ago |
|
王杰
|
096e2fc8bf
|
test merge ext-dev
|
5 years ago |
|
王杰
|
9b843e9496
|
sonar
|
5 years ago |
|
王杰
|
39ed206a06
|
sonar
|
5 years ago |
|
王杰
|
f0c09ca0e6
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
2b89e35c69
|
pom
|
5 years ago |
|
王杰
|
78b5bb0c08
|
Merge branch 'test'
|
5 years ago |
|
王杰
|
bef695e533
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
7111a3b60f
|
pojo
|
5 years ago |
simon.song
|
ca8ca18f34
|
数据同步接口修改查询条件
|
5 years ago |
|
许心洁
|
1367584df0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
许心洁
|
cf83ab060d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
simon.song
|
24bd5ab668
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
simon.song
|
ff5348bf99
|
中航看板取值修改
|
5 years ago |