许心洁
|
e3d5e5bb19
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
wei.peng
|
eb2f61c32f
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
汪云昊
|
4309454d2a
|
邮件异常提示优化
EXCEL数据通用导出
|
6 years ago |
|
wei.peng
|
f32f7e72a2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
shiyanghuan
|
f3151cbbe3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
e13d4163b7
|
库存交易报表代码提交
|
6 years ago |
|
wei.peng
|
a4016dc911
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
刘敏
|
34dcf6d526
|
枚举修改
|
6 years ago |
|
wei.peng
|
734340fe63
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
7b83985f40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
f6bf244b12
|
流程管家放MOVENO的BUG
|
6 years ago |
|
汪云昊
|
6259bd56bc
|
通用EXCEl导出MODEL
|
6 years ago |
jenkins
|
320910e2ae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
dfef27151d
|
冲突
|
6 years ago |
|
许心洁
|
f834e91353
|
Task#764+枚举TRUE_OR_FALSE
|
6 years ago |
jenkins
|
32cc1db3bf
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
peter.pan
|
62b2ea298b
|
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/WmsEnumUtil.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
|
6 years ago |
|
peter.pan
|
ea83820fbf
|
新增物料类型跟单位类型
|
6 years ago |
|
许心洁
|
b3272dc3d7
|
冲突
|
6 years ago |
|
许心洁
|
fe13a43ccc
|
WmsEnumUtil冲突（几步法）
|
6 years ago |
|
jenkins
|
ea4cde868f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
陈思洁
|
fb98db0bcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c08a569ac5
|
sql优化
数据权限实体增加字段
枚举增加数据权限的交易对象
|
6 years ago |
|
刘敏
|
7d0cd674cf
|
零星退料指令导入开发
|
6 years ago |
|
许心洁
|
79d1da3230
|
系统数据初始化
|
6 years ago |
|
jenkins
|
16bb8d6714
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
8e41b40196
|
excel工具类优化
|
6 years ago |
|
jenkins
|
884d4fd763
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
21746dc440
|
excel工具类优化
|
6 years ago |
|
汪云昊
|
163cb6240e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
31c347275c
|
添加重要度枚举
|
6 years ago |
|
jenkins
|
ac8b9d3986
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
b7a7eb29ae
|
安灯类型 查 表 已从表改为枚举
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
|
6 years ago |
|
jenkins
|
68fadff818
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
2adff745fb
|
自定义表单 功能优化
|
6 years ago |
|
wei.peng
|
0fb7e05e88
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
alwaysfrin
|
10c276fb16
|
自定义数据源
|
6 years ago |
|
jenkins
|
511df468ec
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
13af329513
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
|
jenkins
|
a58888df85
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
c4dceace92
|
增加动态报表对外接口-批量修改
|
6 years ago |
|
jenkins
|
878108e86f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
f2b19055d4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
3630f0c2f1
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
jenkins
|
0e70ff103a
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
94166da1ec
|
条码状态修改
|
6 years ago |
|
汪云昊
|
c07858d5ba
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
a5caf4eab5
|
供应商退货枚举新增
|
6 years ago |
|
陈思洁
|
727c1efea8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
507902473c
|
新增业务类型枚举
|
6 years ago |
|
刘敏
|
b0faa179d1
|
报废状态从条码状态移入到质量状态中
|
6 years ago |
|
jenkins
|
1a7cda72d3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
27e4fc8ec2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
28ae6cf85d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
aec4b9a85a
|
自定义表单 多数据源 功能完成
|
6 years ago |
Silliter
|
a39ce52aa9
|
呼叫升级和响应升级优化
|
6 years ago |
|
汪云昊
|
e2cfcc4c5f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
8ea762e5df
|
细节优化
|
6 years ago |
|
汪云昊
|
e514479f00
|
细节优化
|
6 years ago |
allen.zhang
|
67e3851a86
|
Merge branch 'dev' into test
|
6 years ago |
柯裕
|
10cc2ac052
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
d081c16c61
|
安灯类型，状态，子类型，基础数据开发
|
6 years ago |
|
汪云昊
|
4cbc41a959
|
细节优化
|
6 years ago |
|
柯裕
|
3cba9077fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
f1e8f07a90
|
新增需求：自处理
|
6 years ago |
|
wei.peng
|
7ef2eb0c6e
|
报表 表单打通
|
6 years ago |
|
allen.zhang
|
f6d70a2781
|
Merge branch 'dev' into test
|
6 years ago |
|
Silliter
|
1adcd23c6f
|
呼叫升级和响应升级优化
|
6 years ago |
|
柯裕
|
47baf16e0f
|
ANDON动作
|
6 years ago |
|
allen.zhang
|
d70f85d592
|
Merge branch 'dev' into test
|
6 years ago |
|
Silliter
|
9c5aab7215
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
c9243ccad0
|
呼叫升级和响应升级优化
|
6 years ago |
|
陈思洁
|
e33c7c2465
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
8e7b3d61e7
|
枚举修改
|
6 years ago |
|
Silliter
|
27b32626b3
|
开发主动升级和启动产线业务
|
6 years ago |
crish
|
701430066e
|
事务管理
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
ba3064d27d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
3a7aace277
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
1efd33975d
|
生产队列，生产计划，生产工单优化和bug修复
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
8a298687c2
|
开发andon呼叫停止产线
|
6 years ago |
|
Silliter
|
9eb6e82306
|
开发andon呼叫停止产线
|
6 years ago |
|
jenkins
|
fef940bcda
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
jiajack
|
c8a9edab64
|
质量判定业务修改
|
6 years ago |
|
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
6 years ago |
 曾贞一
|
4e45f813dc
|
CS_ORDER_STATUS 枚举修改
DdlPreparedPack getNotInPack getNotInPackString 方法修改
|
6 years ago |
|
许心洁
|
9200080178
|
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
|
6 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
6 years ago |
|
Silliter
|
a42bb71aee
|
docker配置文件修改
|
6 years ago |
|
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
6 years ago |
|
alwaysfrin
|
65b5ac3803
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
cc02090910
|
事务调整及demo
|
6 years ago |
|
Silliter
|
630ad20587
|
开发安灯呼叫升级定时任务
|
6 years ago |
|
jenkins
|
21d3c053ca
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
b5696a63f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
e79987d235
|
MES流程配置接口（流程，产品流程配置）
|
6 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
b90139312c
|
条码管控枚举添加
|
6 years ago |
yiming.gu
|
2eb732c7df
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
|
6 years ago |
|
yiming.gu
|
7c647c7844
|
1、班次pojo修改
2、andon项目新增组织模型基础数据
|
6 years ago |