wynne1005
|
385156cd18
|
refactor(core): SSO 支持方式变更
|
4 years ago |
 王杰
|
f8e0146b19
|
pom
|
4 years ago |
 曾贞一
|
f05c9bfaa4
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
 钮海涛
|
1072a62f79
|
PDA首页增加目标存储区显示
|
4 years ago |
andly.pan
|
5859716998
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
5e98df411e
|
更改重置参数
Signed-off-by: andly.pan <andly.pan@estsh.com>
|
4 years ago |
汪云昊
|
960ec37cbc
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
|
汪云昊
|
a067683998
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
puxiao.liao
|
2da5b569a6
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
puxiao.liao
|
29ee22da5d
|
软适配定时任务的修改
|
4 years ago |
|
andly.pan
|
754124ff25
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
汪云昊
|
c6031a0fc4
|
feat(softswitch):添加sap-rfc适配器
|
4 years ago |
|
wynne1005
|
1f94eee641
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
6318ca6afc
|
feat(form): 动态表单新增跳转详情页枚举
|
4 years ago |
|
王杰
|
f0c09ca0e6
|
Merge branch 'test' into dev
|
4 years ago |
|
王杰
|
2b89e35c69
|
pom
|
4 years ago |
许心洁
|
1367584df0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
cf83ab060d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
许心洁
|
5fae039262
|
合并测服代码
|
4 years ago |
|
许心洁
|
071b0ea9ce
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
# Conflicts:
# sonar-project.properties
|
4 years ago |
|
许心洁
|
410b95aefd
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
# modules/i3plus-wms-apiservice/pom.xml
|
4 years ago |
|
王杰
|
5a5874b137
|
test
|
4 years ago |
|
王杰
|
45a1b63a23
|
Merge branch 'test'
|
4 years ago |
|
王杰
|
84d9ec15f2
|
pom
|
4 years ago |
|
王杰
|
f1db936f42
|
pom
|
4 years ago |
|
wynne1005
|
665a89a8ae
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
5b2f57450b
|
feat(core): 松下GID单点登录需求
支持E9方式的SSo
|
4 years ago |
|
王杰
|
c8b21c0b69
|
pom
|
4 years ago |
|
许心洁
|
d107c7a3fe
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
肖奕扬
|
0ee06f6e03
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
6fab12fc50
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
e72c2dd09a
|
任务#2586
|
4 years ago |
|
puxiao.liao
|
d486da1120
|
增加二维码生成功能
|
4 years ago |
|
钮海涛
|
2740830e8f
|
合并test代码
|
4 years ago |
|
王杰
|
58c7b6854b
|
pom
|
4 years ago |
|
曾贞一
|
bbd5dccbf8
|
【合并分支】
|
4 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
|
汪云昊
|
2cfbe85ab6
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
718466b8df
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
汪云昊
|
60ef8f3b96
|
feat(sms):平台短信功能
|
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 |
|
puxiao.liao
|
268c04ddf3
|
Fix bug#13229
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
许心洁
|
1474be7486
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
0bb69b6505
|
优化盘点
|
4 years ago |
|
许心洁
|
de9578d439
|
墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
4 years ago |
Dominic_Xiao
|
86f9faa01d
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
puxiao.liao
|
ad0325f7df
|
修复天津BUG
|
5 years ago |
|
wynne1005
|
d893e76ab4
|
merge
|
5 years ago |
|
wynne1005
|
aa450c10e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
bdf8e0d782
|
错误pojo修改
|
5 years ago |
|
Dominic_Xiao
|
167b0dad0c
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
puxiao.liao
|
46cc056a43
|
修复天津BUG
|
5 years ago |
simon
|
55188db083
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
af732b7a4f
|
合并test代码
|
5 years ago |
|
puxiao.liao
|
9b70e3c7bf
|
fifo 推荐过滤条码
|
5 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
许心洁
|
66de2c1cbb
|
任务#2965
|
5 years ago |
|
许心洁
|
4757408a3b
|
任务#2965
|
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 |
|
汪云昊
|
cc947c08f5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
8f899f2f46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
fdec58c92a
|
feat(form):表单导入功能支持
|
5 years ago |
|
汪云昊
|
206e5f8d20
|
feat(form):支持导入数据
|
5 years ago |
|
汪云昊
|
1825cfbdf3
|
revert(pojo):还原pom版本
|
5 years ago |
|
puxiao.liao
|
e68735be83
|
MOVE_SN 增加 left_code 属性
|
5 years ago |
|
汪云昊
|
c9b4b37c23
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
687de9d828
|
feat(form):支持存储过程参数
|
5 years ago |
|
曾贞一
|
d8e5aa44bc
|
pom.xml
|
5 years ago |
|
曾贞一
|
9a350912ea
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
|
5 years ago |
|
汪云昊
|
31cdda5b33
|
feat(softswitch):适配记录,FTP文件支持SID
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
puxiao.liao
|
6907ab6dc0
|
北京麦格纳看板需求
|
5 years ago |
|
汪云昊
|
15dc4b00c7
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
ed22bd6f64
|
feat(form):存储过程调用适配mysql,mssql
|
5 years ago |
rock.yu
|
c3bdf4a162
|
解决10330库存扣减不准的问题
|
5 years ago |
|
puxiao.liao
|
6d64c61848
|
修改FIFO推荐查询逻辑
|
5 years ago |
|
汪云昊
|
2b6ff6498c
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
b186af893c
|
feat(softswitch):ftp适配信息优化
|
5 years ago |
|
puxiao.liao
|
44b5635e78
|
天津麦格纳PO生产任务增加关联行号
|
5 years ago |
|
钮海涛
|
af4bb83f85
|
sweb合并test代码
|
5 years ago |
|
钮海涛
|
1695d75ff2
|
合并dev代码
|
5 years ago |
|
钮海涛
|
94568777fb
|
合并test代码
|
5 years ago |
|
puxiao.liao
|
5033c8dde0
|
Fix bug#11661
移库单界面增加来源存储区和目标库位的检索条件
|
5 years ago |
|
汪云昊
|
604b8821eb
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
815daba16d
|
feat(softswitch):ftp适配记录按文件名查询
|
5 years ago |
|
汪云昊
|
0d20685a55
|
fix(softswitch):ftp适配器并发读取文件重复
|
5 years ago |
|
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
|
汪云昊
|
56bd07dbf3
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
钮海涛
|
543058b3a5
|
合并sweb代码
|
5 years ago |
|
puxiao.liao
|
4bfb903e54
|
修复麦格那发运提交事务重复&盘点提交sql异常
|
5 years ago |
|
钮海涛
|
5c104e036f
|
合并test代码
|
5 years ago |
|
汪云昊
|
6156207369
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
d19fbe8cf1
|
fix(core):用户信息导出时，用户状态信息为空
|
5 years ago |
|
汪云昊
|
163d0773a9
|
修改pom文件版本
|
5 years ago |
|
汪云昊
|
4e8716f173
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
55a8bcad72
|
feat(core):系统更新记录功能
|
5 years ago |
|
钮海涛
|
485c66aaf7
|
合并test代码
|
5 years ago |
|
puxiao.liao
|
3cf5c70774
|
修复MGN系列BUG
|
5 years ago |
|
puxiao.liao
|
f1715db664
|
Finish Task #2184 Cost:8h
2184 06 1.2.3.7.1物流路线检查
|
5 years ago |
|
汪云昊
|
7a4be36111
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
ab608c0919
|
feat:用户导出
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
d47607880e
|
合并冲突
|
5 years ago |
|
曾贞一
|
6ca0948a5d
|
【11026 20011--有关北美收货产生的需求变更--0910】
|
5 years ago |
|
汪云昊
|
f878e6b283
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
曾贞一
|
332e37ea94
|
【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】
|
5 years ago |
|
rock.yu
|
3935bde8f6
|
同步 SAP 数据同步 JOB（从仪征同步）
|
5 years ago |
|
许心洁
|
73c0ae5d42
|
优化合并仪征代码
|
5 years ago |
|
钮海涛
|
51746154ba
|
合并dev到test
|
5 years ago |
|
钮海涛
|
e6b472bcfd
|
合并test代码到dev
|
5 years ago |
|
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
|
wynne1005
|
f06f51cc7e
|
master merge test
|
5 years ago |
|
曾贞一
|
a9e97d4e28
|
【2688 08 extPDA-查询查看零件对应库位】
【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】
|
5 years ago |
|
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
qianhs
|
86c9bce2aa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
宋军超
|
fa4b1e09aa
|
修改海纳川问题
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
f760b72094
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
宋军超
|
8bc0da924c
|
修改海纳川问题
|
5 years ago |
|
qianhs
|
c872663847
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
汪云昊
|
e6ecd4f86f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
0d40470059
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
18a09cc4b6
|
FTP多文件读取问题
脚本解析功能初版
|
5 years ago |
|
王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
许心洁
|
f791b3f82f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
ffc70e158a
|
BUG#8696
|
5 years ago |
|
钮海涛
|
5a64ce6021
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
qianhs
|
163d610265
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
许心洁
|
46904c43d1
|
任务#2528，#2545
|
5 years ago |
|
puxiao.liao
|
3c3a5f6068
|
Fix bug#9902
20089+物料拆分条码异常+0724
|
5 years ago |
|
rock.yu
|
0f8326d5f8
|
1. 修改扭矩枪采集部分因主数据变动引起的逻辑变动
|
5 years ago |
|
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
5 years ago |
|
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
|
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
3c22c8e3f4
|
test版本合并到master
|
5 years ago |
|
wynne1005
|
d0e1900a84
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
c1fd1f6eee
|
bypass redo release
|
5 years ago |
|
宋军超
|
13142b4ce1
|
修改电检逻辑
|
5 years ago |
|
puxiao.liao
|
31c3fcd868
|
泰国需求
|
5 years ago |
|
王杰
|
b3999ad481
|
dev merge test
|
5 years ago |