4b032ac426
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
16073eb7e5
安灯附属表插入时， 完整数据； 添加安灯来源接口
6 years ago
89ab1816e3
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
8d7c77d3ed
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71a68e8cf6
枚举
6 years ago
c955047746
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1769e7765f
加了main方法发版报错
6 years ago
王杰
95cc0b433e
mes组织模型bug修复
6 years ago
王杰
18bc35f60d
Merge branch 'dev' into test
6 years ago
c67fe92297
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3e8bcbeb84
枚举
6 years ago
60f441e685
Merge branch 'dev' into test
6 years ago
d495046dcf
添加XML 工具实现
6 years ago
473e2caea0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2cf4759c21
枚举
6 years ago
60d1798b9c
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
ddfb47e6ac
mes设备台账功能开发
6 years ago
1e41ab2e39
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
9553e962e3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bd55a18bf6
微服务接口 - 打印模板分页查询
6 years ago
232c675444
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
d2c3045575
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
84a96a22fa
新加NotNumBiggerPackContainsZero方法
6 years ago
4477820c1b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
68b0058e1b
枚举
6 years ago
1defd0d8be
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
a11eeae45c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
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
ddf1d2e6dc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5a5b7b882e
条码模型
6 years ago
4ceba7144c
【物流线路修改】 修改枚举值重复问题
6 years ago
10fcc569bd
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
8beee972a9
【物流线路维护】 增加处理模式类型
6 years ago
e9f82d9259
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
692110b92b
【物流线路维护】增加前端处理模式枚举
6 years ago
e35cf183da
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
42a8fb357f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
82fe491bd3
#1050 工位监控
6 years ago
7a403a37da
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
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
e20ee7b1ff
安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤
6 years ago
fe174a47ee
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
fb9340fc09
安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑
6 years ago
30eee05b1c
Merge branch 'dev' into test
6 years ago
766d195088
开线合并代码
6 years ago
183fd78eac
冲突解决
6 years ago
99382a8fca
Merge branch 'dev' into test
6 years ago
eb70017396
Xml 解析添加重试机制
6 years ago
曾贞一
bc83b57f8e
合并代码
6 years ago
曾贞一
fb86682652
VDA 生产快速入库
6 years ago
0982f01eb2
Merge branch 'dev' into test
6 years ago
26684524f1
生产报工组件和生产报工标签组件提交
6 years ago
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
4e303413ff
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c0fc2c36bf
Socket 适配器完成
...
MQ 适配器完成
6 years ago
王杰
80f50fe800
Merge branch 'dev' into test
6 years ago
王杰
804574090f
pcn生产工单
6 years ago
a601d5ddf3
orderBy方法去掉为空判断
6 years ago
9ae6ee5016
Merge branch 'test'
6 years ago
51c21f2c22
Merge branch 'dev' into test
6 years ago
d8824ab066
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
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
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
9e12bb5da3
Merge branch 'dev' into test
6 years ago
87dfdc6471
增加方法notInPackArray（）， 修复工具类 notInPack() notInPackString()方法无效的问题
6 years ago
f96cbd1be3
Merge branch 'dev' into test
6 years ago
033b23321f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7c472b386a
提交
6 years ago
355cd49649
注释 WebService 发送邮件客户端
6 years ago
790c0b4ec6
Merge branch 'dev' into test
6 years ago
7131271edc
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
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
4b17c6ca69
Merge branch 'dev' into test
6 years ago
王杰
310d0f0606
mes生产工单审批
6 years ago
曾贞一
d07173bd64
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
dcc13e622b
Merge branch 'dev' into test
6 years ago
5cb2e7994b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cf64f0118a
提交
6 years ago
f3f77e63b3
Merge branch 'test'
6 years ago
4d5497929a
Merge branch 'dev' into test
6 years ago
a9e369e716
任务枚举添加导出转换方法
6 years ago
0b8bc114bc
服务端调整
6 years ago
2d911c4257
安灯优化
6 years ago
27a7aa960c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
37701bed62
提交
6 years ago
c47c617aab
Merge branch 'dev' into test
6 years ago
王杰
8570b88761
mes生产工单
6 years ago
c17039ce4a
Merge branch 'dev' into test
6 years ago
4e1635fe7e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9b0c5de954
提交
6 years ago
曾贞一
6c8cfd8678
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
52a770ad45
Merge branch 'dev' into test
6 years ago
王杰
24a31c0bdf
生产工单实体
6 years ago
541ea98d98
Merge branch 'dev' into test
6 years ago
a9a318e354
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
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
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
c7ed8613d6
软适配添加WebService 默认处理
6 years ago
83f400a36b
sql 注入 删除斜杠
6 years ago
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
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
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
51974a46b9
WebService 调用发送邮件测试
6 years ago
35beb0c60e
Merge branch 'dev' into test
6 years ago
377a875fec
软适配客户端代码结构调整。
6 years ago
fc1c7ab797
软适配添加-所有适配命令 接口
6 years ago
2c6b223628
软适配客户端代码结构调整。
6 years ago
212cfb02af
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
21241e45ca
软适配功能配置优化
6 years ago
5144d15ac4
采购单报表开发
6 years ago
bbfc9b320f
Merge branch 'test'
6 years ago
4a1ad40dfa
Merge branch 'dev' into test
6 years ago
b899c5c8c5
软适配 WebService 功能接口开发
6 years ago
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
9ec5e63da6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5b200f824f
软适配 WebService 功能开发
6 years ago
3eef8ea750
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
029d7eac62
软适配model
6 years ago
2d376575a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3c6d17a283
修改pojo数据类型
6 years ago
ccffe9b7bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c44a99eb40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
8d8752b8b4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
8f1ac3fdae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f370f377d4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ce78b170f
工作参数枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
0a3339ba8d
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ff462900b7
枚举描述添加
6 years ago
2e8a70d8b4
pom版本还原--pojo
6 years ago
王杰
482159b322
mes-pcn定时任务枚举修改
6 years ago
53a08621fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
db4f6bcdb1
流程管家：添加作业记录明细（快速流程每一次扫条码都会生成一个新的移动单）
6 years ago
b760543b3b
excel通用导入优化
6 years ago
a5b01bbaae
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
69d2932ca4
http请求增加不需要设置请求内容枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
3a1cf7a2b7
判断属性是否有final修饰
6 years ago
b4b095c970
判断属性是否有final修饰
6 years ago
4d5c92df78
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
d5cfe77ac5
mes定时任务枚举
6 years ago
32502582c1
新增属性初始化
6 years ago
eadb86ce60
excel通用导入优化
6 years ago
fb3b8a033d
excel通用导入优化
6 years ago
7aec1fdb6a
添加工步类型枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7f3f39af06
提交
6 years ago
63c0f02f32
提交
6 years ago
146cf768d6
提交
6 years ago
5e06022e51
Merge remote-tracking branch 'remotes/origin/dev'
6 years ago
24a9d3ff2c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8a5337daad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
235a728c0e
andon
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
9c26f45cd5
明细状态枚举添加
6 years ago
王杰
2e86ff81d0
mes工作单元参数增加枚举
6 years ago
王杰
6929e88570
mes-pcn定时任务
6 years ago
曾贞一
ae12af551b
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
cfc0de67cf
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
057fa88904
revert
6 years ago
c6584a9437
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
368a3a1c66
mes枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7740503a97
getByProperty查询到多条数据抛异常
6 years ago
1b06c1d07f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
5947f88da1
mes-pcn定时任务工作清单数据同步
6 years ago
b7e17c5451
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
2325d18660
软件适配器 认证参数接口
6 years ago
3bedf8fb8d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
6 years ago
953f593207
提交
6 years ago
592cd15add
调试枚举删除、库位导入工厂字段添加
6 years ago
曾贞一
25e7ca08d3
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
7e5d2e1e56
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
1f1a9c39fc
异常国际化功能开发完成
6 years ago
曾贞一
5aceaca82d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
9680112434
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
18aff86ea0
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
王杰
3b3ddd581a
mest条码生成规则最大值是否循环枚举
6 years ago
6d925d6b9f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a38347d2fb
revert
6 years ago
34e2c13b38
getByProperty获取到多条数据报错
6 years ago
c901f18f89
pom版本还原
6 years ago
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f6b49bf31a
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
9bea065f35
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
b10b967b73
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
884f3e1a96
合并代码
6 years ago
王杰
aebe742280
mes枚举增加关键件条码规则信息模块的绑定规则
6 years ago
d7b0f30d91
IMPP 平台功能功能优化 . 软适适配功能开发
6 years ago
88f735ff63
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5e72d98ad8
提交
6 years ago
4359f347c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1328dc7ddd
#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
曾贞一
acd1e6cfb6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
ce70994a57
盘点 按照盘点差异类型汇总
6 years ago
a2a4dc6beb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
e83efe76e0
软件适配器 测试
6 years ago
0b13c6dd70
order by 列类型装换
6 years ago
f10ff69ce0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
crish
许心洁
lbwgithub
王杰
WYnneaoapc
wei.peng
刘辉
汪云昊
曾贞一
陈思洁
jenkins
刘敏
于学杰
jimmy.zeng