898 Commits (2e8a70d8b46b5d1664bfcc8b7444cf095feb8005)

Author SHA1 Message Date
jimmy.zeng 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
crish a5b01bbaae Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 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
crish 7aec1fdb6a 添加工步类型枚举
Signed-off-by: crish <570360737@qq.com>
6 years ago
WYnneaoapc 7f3f39af06 提交 6 years ago
WYnneaoapc 63c0f02f32 提交 6 years ago
WYnneaoapc 146cf768d6 提交 6 years ago
刘敏 24a9d3ff2c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 8a5337daad Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 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
许心洁 057fa88904 revert 6 years ago
crish c6584a9437 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 368a3a1c66 mes枚举
Signed-off-by: crish <570360737@qq.com>
6 years ago
许心洁 7740503a97 getByProperty查询到多条数据抛异常 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
WYnneaoapc 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
WYnneaoapc 953f593207 提交 6 years ago
刘敏 592cd15add 调试枚举删除、库位导入工厂字段添加 6 years ago
wei.peng 1f1a9c39fc 异常国际化功能开发完成 6 years ago
王杰 3b3ddd581a mest条码生成规则最大值是否循环枚举 6 years ago
许心洁 a38347d2fb revert 6 years ago
许心洁 34e2c13b38 getByProperty获取到多条数据报错 6 years ago
WYnneaoapc c7842e63a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 884f3e1a96 合并代码 6 years ago
王杰 aebe742280 mes枚举增加关键件条码规则信息模块的绑定规则 6 years ago
wei.peng d7b0f30d91 IMPP 平台功能功能优化 . 软适适配功能开发 6 years ago
WYnneaoapc 5e72d98ad8 提交 6 years ago
WYnneaoapc 4ff3677fba Merge branch 'test' into dev 6 years ago
WYnneaoapc 0aef9adac9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 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
汪云昊 e83efe76e0 软件适配器 测试 6 years ago
汪云昊 0b13c6dd70 order by 列类型装换 6 years ago