刘辉
|
1defd0d8be
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
WYnneaoapc
|
a11eeae45c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7ee11674ab
|
读取托盘
|
6 years ago |
 曾贞一
|
e24474fc8c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
2b62357ab5
|
VDA收货【生产快速入库】组件，任务编号1051
|
6 years ago |
wei.peng
|
cecd37a1e7
|
添加Xml 工具
|
6 years ago |
许心洁
|
1d17198daf
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
汪云昊
|
ac1c18581e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
d8c740819c
|
FTP适配器
|
6 years ago |
|
许心洁
|
61804a27b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lbwgithub
|
ddf1d2e6dc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
5a5b7b882e
|
条码模型
|
6 years ago |
|
bleakney.liu
|
4ceba7144c
|
【物流线路修改】 修改枚举值重复问题
|
6 years ago |
|
许心洁
|
10fcc569bd
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
bleakney.liu
|
8beee972a9
|
【物流线路维护】 增加处理模式类型
|
6 years ago |
|
bleakney.liu
|
e9f82d9259
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
bleakney.liu
|
692110b92b
|
【物流线路维护】增加前端处理模式枚举
|
6 years ago |
|
许心洁
|
e35cf183da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
42a8fb357f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
82fe491bd3
|
#1050 工位监控
|
6 years ago |
|
bleakney.liu
|
4409f34e0f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
3ef7d24eab
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
陈思洁
|
3cc1997ae2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c2da7410eb
|
新增枚举提交
|
6 years ago |
crish
|
e20ee7b1ff
|
安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤
|
6 years ago |
|
crish
|
fe174a47ee
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
fb9340fc09
|
安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑
|
6 years ago |
jenkins
|
30eee05b1c
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
766d195088
|
开线合并代码
|
6 years ago |
|
WYnneaoapc
|
183fd78eac
|
冲突解决
|
6 years ago |
|
jenkins
|
99382a8fca
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
eb70017396
|
Xml 解析添加重试机制
|
6 years ago |
|
曾贞一
|
bc83b57f8e
|
合并代码
|
6 years ago |
|
曾贞一
|
fb86682652
|
VDA 生产快速入库
|
6 years ago |
|
jenkins
|
0982f01eb2
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
26684524f1
|
生产报工组件和生产报工标签组件提交
|
6 years ago |
|
jenkins
|
7e3edd06a0
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
22fbbe2a91
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
edfc78995b
|
新增打印机配置表
|
6 years ago |
|
汪云昊
|
3b46d242a7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
|
6 years ago |
|
汪云昊
|
d830c78d03
|
FTP适配器
|
6 years ago |
|
wei.peng
|
4e303413ff
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
c0fc2c36bf
|
Socket 适配器完成
MQ 适配器完成
|
6 years ago |
 王杰
|
80f50fe800
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
804574090f
|
pcn生产工单
|
6 years ago |
|
crish
|
a601d5ddf3
|
orderBy方法去掉为空判断
|
6 years ago |
|
crish
|
d8824ab066
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
4173f0637f
|
安灯正式环境发布
|
6 years ago |
|
曾贞一
|
8a89b95ebf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
cd8a5df991
|
VDA 生产快速入库组件开发
|
6 years ago |
|
jenkins
|
829171f8a4
|
Merge branch 'dev' into test
|
6 years ago |
刘敏
|
ef6c47dc35
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
e42cd80b8b
|
条码打印枚举添加待退料状态
|
6 years ago |
|
jenkins
|
9e12bb5da3
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
87dfdc6471
|
增加方法notInPackArray（）， 修复工具类 notInPack() notInPackString()方法无效的问题
|
6 years ago |
|
WYnneaoapc
|
f96cbd1be3
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
033b23321f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7c472b386a
|
提交
|
6 years ago |
|
wei.peng
|
355cd49649
|
注释 WebService 发送邮件客户端
|
6 years ago |
|
jenkins
|
790c0b4ec6
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
7131271edc
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jenkins
|
cbc5882bd5
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
d676bcf974
|
mes生产工单下达配置状态
|
6 years ago |
|
汪云昊
|
c10bf2e3e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
4b17c6ca69
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
310d0f0606
|
mes生产工单审批
|
6 years ago |
|
crish
|
dcc13e622b
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
5cb2e7994b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
cf64f0118a
|
提交
|
6 years ago |
|
crish
|
4d5497929a
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
a9e369e716
|
任务枚举添加导出转换方法
|
6 years ago |
|
汪云昊
|
0b8bc114bc
|
服务端调整
|
6 years ago |
|
crish
|
2d911c4257
|
安灯优化
|
6 years ago |
|
WYnneaoapc
|
27a7aa960c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
37701bed62
|
提交
|
6 years ago |
|
crish
|
c47c617aab
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
8570b88761
|
mes生产工单
|
6 years ago |
|
crish
|
c17039ce4a
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
4e1635fe7e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
9b0c5de954
|
提交
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
|
crish
|
52a770ad45
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
24a31c0bdf
|
生产工单实体
|
6 years ago |
|
jenkins
|
541ea98d98
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
a9a318e354
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
61b0dfdc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
809478be44
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d8bc8d713d
|
条码打印model字段添加
|
6 years ago |
|
wei.peng
|
41588f37d7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
d1d7e65f97
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
c7ed8613d6
|
软适配添加WebService 默认处理
|
6 years ago |
|
汪云昊
|
83f400a36b
|
sql 注入 删除斜杠
|
6 years ago |
|
crish
|
b31162c5d6
|
安灯工位放行， 安灯任务管理界面数据权限控制
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
于学杰
|
f6bb2ee21f
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
337e5f7084
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
f17c1d3d25
|
推荐入库 组件开发
|
6 years ago |
|
王杰
|
2460fbc3b4
|
生产计划
|
6 years ago |
|
汪云昊
|
564deb4d6b
|
适配记录及数据库适配器
|
6 years ago |
|
汪云昊
|
3474bb82c6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
f978ee39c8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
f6c1eff0f1
|
excel通用导入优化
|
6 years ago |
|
汪云昊
|
d120b1615a
|
国际化工具类
|
6 years ago |
|
jenkins
|
ee979c6e02
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
9caf9a4458
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
2f904f9eee
|
数据库适配器
|
6 years ago |
|
汪云昊
|
c27449a185
|
异常信息国际化
|
6 years ago |
jimmy.zeng
|
d23045a667
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
5b6477bba6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
510485d2f0
|
excel导出优化--单据状态显示枚举描述
|
6 years ago |
|
wei.peng
|
51974a46b9
|
WebService 调用发送邮件测试
|
6 years ago |
|
crish
|
35beb0c60e
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
377a875fec
|
软适配客户端代码结构调整。
|
6 years ago |
|
wei.peng
|
fc1c7ab797
|
软适配添加-所有适配命令 接口
|
6 years ago |
|
wei.peng
|
2c6b223628
|
软适配客户端代码结构调整。
|
6 years ago |
|
wei.peng
|
212cfb02af
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
71798e9f51
|
软适配功能配置优化
|
6 years ago |
|
汪云昊
|
eeff3517c6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
|
6 years ago |
|
汪云昊
|
07688db533
|
软适配实体
|
6 years ago |
|
陈思洁
|
74bdaccfbd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
8ed0d4d60e
|
枚举维护业务类型数据
|
6 years ago |
|
汪云昊
|
f2e2dd1670
|
软件适配器 数据源适配器
单号生成高并发优化
|
6 years ago |
|
wei.peng
|
21241e45ca
|
软适配功能配置优化
|
6 years ago |
|
刘敏
|
5144d15ac4
|
采购单报表开发
|
6 years ago |
|
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
b899c5c8c5
|
软适配 WebService 功能接口开发
|
6 years ago |
|
wei.peng
|
e921bb72d2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
|
6 years ago |
|
wei.peng
|
9ec5e63da6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
5b200f824f
|
软适配 WebService 功能开发
|
6 years ago |
|
汪云昊
|
3eef8ea750
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
029d7eac62
|
软适配model
|
6 years ago |
|
jimmy.zeng
|
2d376575a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
3c6d17a283
|
修改pojo数据类型
|
6 years ago |
|
jimmy.zeng
|
ccffe9b7bd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
WYnneaoapc
|
c44a99eb40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
61a7985afc
|
提交 0905
|
6 years ago |
|
刘敏
|
5b97a9e0cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
241a478f65
|
excel导出优化--单据状态显示枚举描述
|
6 years ago |
|
crish
|
8d8752b8b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
89b0a4a68a
|
条码打印调试
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
刘敏
|
f0fba5e23a
|
盘点枚举添加--excel导出
|
6 years ago |
|
曾贞一
|
b7bd96fa44
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
64aed1f49c
|
开发 Restful 接口测试PDA
|
6 years ago |
|
jimmy.zeng
|
8f1ac3fdae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
f370f377d4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
7ce78b170f
|
工作参数枚举
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
0a3339ba8d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
ff462900b7
|
枚举描述添加
|
6 years ago |