王杰
2e86ff81d0
mes工作单元参数增加枚举
6 years ago
154730e69b
Merge remote-tracking branch 'remotes/origin/dev' into test
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
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
6 years ago
1d55cd22a6
order by 列类型装换
6 years ago
39a00d3a19
order by 列类型装换
6 years ago
e8741ec364
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
1b30b927ce
自定义表单功能优化
6 years ago
曾贞一
e1cb06da5c
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
483ea59142
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c34a369e93
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ef1450e912
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
b9d9d7402e
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
7002ac5a8a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
619251474d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f5c0ca9383
软适配模型调整
6 years ago
c05e3b13c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
63d86a4b0d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ecba29948f
816 add method
6 years ago
69525fbaa9
表单菜单排序
6 years ago
曾贞一
fbe8544a02
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
cef48801df
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
7455c6c640
软适配配置文件初始化
6 years ago
aee54acafc
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
46c710e559
表单功能优化，虚拟属性连表查询，时间格式化对接
6 years ago
6d99080069
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c986f7b2a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
9ee2901346
添加字典分组
...
优化redis资源键
6 years ago
66f49f3fdc
自定义表单功能调整
6 years ago
曾贞一
47d4a53706
Merge branch 'dev'
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/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-report/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
6 years ago
曾贞一
8b457c0618
DEV 合并 TEST pom.xml文件修改
6 years ago
4235184afc
Merge branch 'Process' into dev
6 years ago
e7913cfb26
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
6 years ago
24da688384
Merge branch 'test' into dev
6 years ago
31313baec9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
曾贞一
b3a0a71065
库存初始化信息
6 years ago
476d943a69
流程管家：自定义按钮触发的时候不需要预先调用当前步骤的回显信息
6 years ago
40fc36ef18
流程管家优化：快速提交流程手动提交校验
6 years ago
af7b2404dd
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
d8786d8132
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
fb07628555
Merge branch 'dev' into test
6 years ago
c1cff11c7c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
363d521c36
Merge branch 'test'
6 years ago
d45b7b77f3
Merge branch 'dev' into test
6 years ago
bb8078cb94
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7f3d902a30
流程管家：提交检验+预回显优化；
...
直送发运JOB:#5132
6 years ago
750e4d75dc
添加 XStream 插件
6 years ago
bda52f76c6
软适配 Json 请求适配完成
6 years ago
b4dc0c254b
Merge branch 'test'
6 years ago
24bbd75c81
Merge branch 'dev' into test
6 years ago
曾贞一
c7571b4c66
IS_GENERAL_TASK 添加单据是否生成任务状态 撤销
6 years ago
60e6d51d35
流程管家2.0
6 years ago
19871c5f27
Merge branch 'test'
6 years ago
8f977719c0
Merge branch 'dev' into test
6 years ago
5a7ce32761
冲突
6 years ago
b5c204f873
软适配接口制作完成
6 years ago
562ea029fc
Merge branch 'test'
6 years ago
王杰
jimmy.zeng
曾贞一
许心洁
crish
汪云昊
WYnneaoapc
刘敏
wei.peng
于学杰
peter.pan