administrator
|
ebbb1b9f34
|
修改pojo版本号-供优化使用
|
1 year ago |
|
administrator
|
e73b97cd47
|
动态表单调用微服务挂载菜单防止二次挂载
|
2 years ago |
castle.zang
|
317d1c6129
|
sweb供应商自助修改密码
|
3 years ago |
nies
|
2418d6d655
|
修改ext-dev pojo版本为1.0.0.1
|
3 years ago |
|
castle.zang
|
8a369c31fa
|
通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT
|
3 years ago |
puxiao.liao
|
d7b34facf0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/pom.xml
modules/i3plus-pojo-mes-pcn/pom.xml
modules/i3plus-pojo-mes/pom.xml
modules/i3plus-pojo-model/pom.xml
modules/i3plus-pojo-platform/pom.xml
modules/i3plus-pojo-ptl/pom.xml
modules/i3plus-pojo-report/pom.xml
modules/i3plus-pojo-screen/pom.xml
modules/i3plus-pojo-softswitch/pom.xml
modules/i3plus-pojo-sweb/pom.xml
modules/i3plus-pojo-wms/pom.xml
modules/i3plus-pojo-workflow/pom.xml
pom.xml
sonar-project.properties
|
4 years ago |
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
duan.yang
|
48779edcfc
|
添加同步至WMS标识
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
|
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
 王杰
|
5d33795cff
|
test merge dev
|
4 years ago |
|
puxiao.liao
|
a001dae575
|
代码回滚
|
4 years ago |
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
|
duan.yang
|
a30e97336c
|
供应商关系添加物料字段，工厂代码查询条件Bug
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
肖奕扬
|
0ee06f6e03
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
duan.yang
|
63fc619c74
|
同步标识
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
duan.yang
|
c2eac0f71c
|
同步标识
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
 曾贞一
|
bbd5dccbf8
|
【合并分支】
|
4 years ago |
 钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
|
钮海涛
|
baed7db4ed
|
合并dev代码
|
4 years ago |
|
钮海涛
|
48b4e45850
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
4 years ago |
|
钮海涛
|
6e5ea4462f
|
合并master代码
|
4 years ago |
|
钮海涛
|
977b8ac23c
|
Merge remote-tracking branch 'remotes/origin/test'
|
4 years ago |
|
钮海涛
|
05dca352dd
|
修改订单履历功能
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
wynne1005
|
b7c4e76163
|
增加joined注解
|
4 years ago |
simon.song
|
effc34f74d
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/pom.xml
|
4 years ago |
|
钮海涛
|
0923584955
|
Sweb问题修复
|
4 years ago |
|
许心洁
|
de9578d439
|
墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
4 years ago |
|
钮海涛
|
b5c994a18b
|
sweb同一供应商编码命名为VendorNo
|
4 years ago |
|
simon.song
|
9b57f47af6
|
修改pom文件
|
4 years ago |
|
wynne1005
|
d893e76ab4
|
merge
|
5 years ago |
|
simon
|
55188db083
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
af732b7a4f
|
合并test代码
|
5 years ago |
|
duan.yang
|
a38be26538
|
采购订单表-主表添加同步标识、接口映射方向类型添加
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
|
钮海涛
|
d9bcdca66a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
eb14a581b9
|
坤泰生成包装任务
|
5 years ago |
|
duan.yang
|
802d5d2320
|
采购订单表-主表添加同步标识
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
钮海涛
|
5cea79571b
|
PO订单查看按创建时间倒叙排序
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
钮海涛
|
89a45d326b
|
合并test代码
|
5 years ago |
|
钮海涛
|
f63813d66d
|
合并master代码
|
5 years ago |
|
钮海涛
|
ceebe541f2
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
汪云昊
|
f2180f18f3
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
378205ef61
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
cc947c08f5
|
revert(pojo):还原pom版本
|
5 years ago |
|
钮海涛
|
156b515497
|
修复SWEB问题
|
5 years ago |