c9df6efd1c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
65b336f708
任务993+生产报工产生的移动明细单位错误BUG修复+PDA颜色回显完成的明细颜色没有与处理中的区分开BUG修复
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
fef022ce13
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2a7ba550d6
Merge remote-tracking branch 'remotes/origin/dev' into test
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
b1dd7d3915
合并冲突
6 years ago
d269576dbf
新增字段
6 years ago
08b697a72e
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
9c26f45cd5
明细状态枚举添加
6 years ago
王杰
2e86ff81d0
mes工作单元参数增加枚举
6 years ago
06927a31bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
09eee24769
mes工作单元参数CRUD
6 years ago
王杰
8034e104c8
mes工作单元参数
6 years ago
王杰
5388c4405b
mes-pcn-task表修改
6 years ago
154730e69b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6e5176c3fc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b10262b21f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ac1090d661
报表返回字段信息添加
6 years ago
9981c4089b
修改唯一性校验， 不能新增禁用的信息
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
王杰
d7ddf4d5a0
mes-pcn定时任务数据同步日志表修改类型
6 years ago
王杰
6929e88570
mes-pcn定时任务
6 years ago
84bcdbaf7d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f09ac4d897
安灯任务
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
399a51b044
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
27d574314d
getList未查到数据要判断+补全所有showInformation区分颜色
6 years ago
95b48cdc54
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71e7362216
PCN数据同步， 逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
cfc0de67cf
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
057fa88904
revert
6 years ago
56a4d6b362
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
19253a9b6a
构造函数新增条码
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
96a29d3de8
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a2fe1a80f9
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
90bb35c83f
用户默认分页配置功能开发
...
用户获取首页插件Bug 修复
6 years ago
18dac2b569
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
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
0dc452c4c8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
592cd15add
调试枚举删除、库位导入工厂字段添加
6 years ago
5df2db4b46
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f820c449bb
工步条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
b34be0b86e
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
2ef0dd5c3b
周期修改关联数据
6 years ago
9de4d79009
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d2036fd841
任务961，962，966，973
6 years ago
59047b5b4c
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
12f6e2c14b
mes-pcn定时任务表维护
6 years ago
7e5d2e1e56
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
18eff49e63
hql语句拼接修改
6 years ago
08fbbee9c1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
11aff72404
新增冗余字段
6 years ago
cf026d6dee
获取模板详情列表功能接口开发完成
6 years ago
1f1a9c39fc
异常国际化功能开发完成
6 years ago
f7b366fe29
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
c584f2e048
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
12a2a27b18
mes， pcn条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
61822039c5
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3f5f89bd1b
流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）
6 years ago
9680112434
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
3b3ddd581a
mest条码生成规则最大值是否循环枚举
6 years ago
6d925d6b9f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
b375983304
mes条码生成规则CURD及mesbug修复
6 years ago
a38347d2fb
revert
6 years ago
b20d333ae4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
34e2c13b38
getByProperty获取到多条数据报错
6 years ago
856c77a965
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c901f18f89
pom版本还原
6 years ago
0bc9f2e9bc
获取模板 微服务调用重新编写
6 years ago
188e2b5efd
pom版本还原
6 years ago
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2deb384cca
提交
6 years ago
3093aa1e86
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bfd682cb27
安灯按照产线过滤信息
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
921859b996
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fe65067ca2
1. 增加 IOT 接口配置表的 POJO
6 years ago
884f3e1a96
合并代码
6 years ago
王杰
aebe742280
mes枚举增加关键件条码规则信息模块的绑定规则
6 years ago
d7b0f30d91
IMPP 平台功能功能优化 . 软适适配功能开发
6 years ago
5e72d98ad8
提交
6 years ago
f56f8d714b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
617bb73dad
增加业务类型字段、修改临时变量字段类型
...
修改hql查询字段
6 years ago
a83b552203
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
60eadfac7a
mes维护页面加模糊查询
6 years ago
2bc04b407e
计划日期、时间新增
6 years ago
cb49d8d848
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ffb6f8a17c
任务列表不分页，主要查询字段加索引
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
7ee5312303
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
dd418f8b51
开线信号发送逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
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
4d00397411
修改盘点范围的排序规则
6 years ago
e83efe76e0
软件适配器 测试
6 years ago
1d587f831b
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
王杰
3348d5c81a
merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
e4aadf35ed
mes生产工单页面按钮控制
6 years ago
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
6 years ago
0b13c6dd70
order by 列类型装换
6 years ago
f10ff69ce0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
1d55cd22a6
order by 列类型装换
6 years ago
39a00d3a19
order by 列类型装换
6 years ago
7eed51791f
软件适配器-定时适配任务
6 years ago
1b30b927ce
自定义表单功能优化
6 years ago
b3a552d65d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
070bacf20e
所有外部单据增加创建时间和创建人的查询条件
6 years ago
2ca432b6a8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f2380f6d14
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
02d60ed1a8
软件适配器-数据适配转换
6 years ago
7a935276a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bc953bb2c8
查询条件封装
6 years ago
de381d438a
领料单模板创建
6 years ago
3711873c29
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c34a369e93
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
9d70008912
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
61ce4d1b3f
优化
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
6c37a60ff4
MES-PCN获取平台打印数据
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
e9c596adce
盘点hql排序修改
6 years ago
4573b09392
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2058789438
盘点业务修改bug
6 years ago
94924cb264
POJO 合并
6 years ago
718ec36747
POJO 合并
6 years ago
41aff3b560
``
6 years ago
619251474d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f5c0ca9383
软适配模型调整
6 years ago
曾贞一
abf155ecd9
库存报表 创建人、创建时间添加
6 years ago
c05e3b13c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
391d0129e1
Merge remote-tracking branch 'origin/dev' 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
221f05b175
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
69525fbaa9
表单菜单排序
6 years ago
839c139222
库存移动条码报表优化
6 years ago
235498b162
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
638d9cb1a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9ff9c11c97
字段调整
6 years ago
b0d2812778
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
409c433b5c
添加字典分组
6 years ago
42f067b987
软适配参数接口
6 years ago
曾贞一
eb035aeaf6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
cf5aded9d9
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
05b9298dec
软适配Repository初始化
6 years ago
曾贞一
cef48801df
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a713e835fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7455c6c640
软适配配置文件初始化
6 years ago
f82011cf5b
实体
6 years ago
1c98f0a3c4
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
dc78cf114f
实体
6 years ago
aee54acafc
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
46c710e559
表单功能优化，虚拟属性连表查询，时间格式化对接
6 years ago
68e4b74e0a
平台权限系功能优化
6 years ago
6d99080069
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
ff52a412d4
库存初始化信息
6 years ago
2860edf722
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b604c5d9a0
交易记录增加字段
6 years ago
374c2bf76c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
92d4bf46ce
#5255,#5039
6 years ago
c986f7b2a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
090efb787f
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
9ee2901346
添加字典分组
...
优化redis资源键
6 years ago
d04d441711
用户管理修改密码 Bug 修复
6 years ago
78267a3a45
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
0f99cb1027
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
66f49f3fdc
自定义表单功能调整
6 years ago
5df9896258
维修， 报废， 系统配置， pcn节点基础数据接口
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
66e20acfe9
0730 Add File Operation in ODS Module untested
6 years ago
曾贞一
7ca6e46e4b
Merge branch 'dev' into test
6 years ago
781a1d2333
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6b442cda1c
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
76684b82c0
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
0e444aa993
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
bf293d4758
生产报工时，原材料move单号写入关联移动单号中
6 years ago
dacc203119
库存报表修改
6 years ago
曾贞一
380efb664e
Merge branch 'dev' into test
6 years ago
8034e9e505
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
da1c9af3d4
库存报表新增
6 years ago
曾贞一
f30a40520b
Merge branch 'dev' into test
6 years ago
d826c47d5a
修改了mesEvent pojo
6 years ago
e0089ab800
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
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
b3f4e62a74
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
794d4b69d6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
许心洁
crish
WYnneaoapc
jimmy.zeng
刘敏
陈思洁
王杰
wei.peng
汪云昊
于学杰
曾贞一