Silliter
|
ba3064d27d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
crish
|
3a7aace277
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
crish
|
1efd33975d
|
生产队列，生产计划，生产工单优化和bug修复
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
Silliter
|
8a298687c2
|
开发andon呼叫停止产线
|
7 years ago |
|
Silliter
|
9eb6e82306
|
开发andon呼叫停止产线
|
7 years ago |
jenkins
|
fef940bcda
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
jiajack
|
c8a9edab64
|
质量判定业务修改
|
7 years ago |
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
7 years ago |
 曾贞一
|
4e45f813dc
|
CS_ORDER_STATUS 枚举修改
DdlPreparedPack getNotInPack getNotInPackString 方法修改
|
7 years ago |
许心洁
|
9200080178
|
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
|
7 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
7 years ago |
|
Silliter
|
a42bb71aee
|
docker配置文件修改
|
7 years ago |
|
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
7 years ago |
alwaysfrin
|
65b5ac3803
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
cc02090910
|
事务调整及demo
|
7 years ago |
|
Silliter
|
630ad20587
|
开发安灯呼叫升级定时任务
|
7 years ago |
|
jenkins
|
21d3c053ca
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
许心洁
|
b5696a63f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
e79987d235
|
MES流程配置接口（流程，产品流程配置）
|
7 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
刘敏
|
b90139312c
|
条码管控枚举添加
|
7 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
|
7 years ago |
|
yiming.gu
|
7c647c7844
|
1、班次pojo修改
2、andon项目新增组织模型基础数据
|
7 years ago |
柯裕
|
c1bf54f9c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
5a3e2996c7
|
findMaxByProperties更新
|
7 years ago |
|
jenkins
|
7c20f070e4
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
crish
|
8c443c3afb
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
crish
|
d6221c39ae
|
生产模块bug修改
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
柯裕
|
72ac3490e4
|
ANDON枚举
|
7 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
7 years ago |
|
柯裕
|
4a84e1e8ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
95789ab615
|
ANDON实体枚举更新
|
7 years ago |
|
yiming.gu
|
12e555e3a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
c7e5fc732e
|
mes组织模型菜单等级枚举修改
|
7 years ago |
|
柯裕
|
56e17f62e9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
593a062e9f
|
ANDON枚举
|
7 years ago |
|
yiming.gu
|
494fc4aa70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
486dda639f
|
pcn队列pojo vin字段改为string型
|
7 years ago |
|
柯裕
|
8ccc265f0d
|
ANDON枚举更新
|
7 years ago |
|
Silliter
|
c9c470a27f
|
开发物理安灯业务
|
7 years ago |
|
Silliter
|
47bd2c0aa7
|
安灯项目开发
|
7 years ago |
|
jenkins
|
298a3c1ddf
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
许心洁
|
4cf5fbc2b7
|
#4091+流程配置复制流程+作业步骤参数，作业组件，作业组件参数，作业流程基础数据接口代码调整
|
7 years ago |
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
7 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
7 years ago |
|
Silliter
|
4e9a8ab787
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
f343ea865c
|
安灯和硬件适配初始化
|
7 years ago |
|
Silliter
|
0a36f9130f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
b2c5494983
|
联调系统配置接口
|
7 years ago |
|
wei.peng
|
8e2bf96a14
|
找回丢失代码
|
7 years ago |
|
jenkins
|
12e2f1d1b8
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
许心洁
|
85a44b1baa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
19f30ce4f9
|
流程配置+定时处理错误移动单给错误信息赋值过长
|
7 years ago |
|
jenkins
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
jiajack
|
d6c7e39989
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jiajack
|
038484e7ac
|
工步调度业务完善
|
7 years ago |
|
yunhao.wang
|
099a58a14d
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
yunhao.wang
|
7e8730ea9f
|
自定义按钮功能接口
消息优化
|
7 years ago |
|
Silliter
|
f8b89c930b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yiming.gu
|
a1a63c2247
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
feace14920
|
PCN同步MES主数据
|
7 years ago |
|
jenkins
|
850b372ab4
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
cb628b0125
|
事务持久化调整
|
7 years ago |
|
jenkins
|
ed474fe112
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
b3f4ccbb78
|
自定义脚本开发
|
7 years ago |
|
Silliter
|
c8c8dc6750
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
yihang.lv
|
b76ccb43d2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
7da6627878
|
sweb通知公告
|
7 years ago |
|
crish
|
82de566e90
|
封装字符串>= <=查询
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
jenkins
|
4a5d0f0cb3
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
yihang.lv
|
cdd0e5fc05
|
消息接口修改
|
7 years ago |
|
Silliter
|
3d56e2539d
|
合并dev代码
|
7 years ago |
|
yunhao.wang
|
950c6dee36
|
附件来源
|
7 years ago |
|
yunhao.wang
|
eee0539562
|
sweb公告处理
|
7 years ago |
|
jenkins
|
0cde3d8a63
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
89d6ef61f4
|
盘点加
|
7 years ago |
|
jenkins
|
fb4be4580d
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
gragon.xu
|
186a9ccb0d
|
监控台
|
7 years ago |
|
Silliter
|
83ce4f0efb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
a62ead1c25
|
Mes生产计划，生产工单
|
7 years ago |
|
wei.peng
|
ef109e185d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
c119c06130
|
自定义表单 使用Redis 1.0 功能完成
|
7 years ago |
|
jenkins
|
df63afecf8
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
8a69224e05
|
优化入库和质检明细处理业务
|
7 years ago |
|
gragon.xu
|
311eaf979a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
e5e0c05b9f
|
Mes生产计划开发
|
7 years ago |
|
Silliter
|
28e43c087b
|
合并dev分支代码
|
7 years ago |
|
wei.peng
|
97e992f05f
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
7 years ago |
|
gragon.xu
|
cd1c135594
|
交易处理组件isPart!=isSnControl（新增枚举取反方法）+库位新增默认状态为“空库位”
|
7 years ago |
|
yihang.lv
|
50f0a7d52a
|
新增逻辑修改
|
7 years ago |
|
yihang.lv
|
1a583f7ebb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
ce55dda367
|
确认订单目录调整
|
7 years ago |
|
Silliter
|
6cb456fcc4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
b2efdd2496
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
crish
|
ab1e524f20
|
MES生产计划枚举
|
7 years ago |
|
Silliter
|
1896472e63
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
gragon.xu
|
01a5cb287b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
e20d212991
|
IS_GENERAL_TASK加上Code+DATA_STATUSCode值改为TRUE和FALSE
|
7 years ago |
|
Silliter
|
0181b0ecab
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
9418373b4d
|
DdlPack，封装bug
|
7 years ago |
|
crish
|
8678d9961e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
crish
|
e161894239
|
Mes生产计划枚举类
|
7 years ago |
|
Silliter
|
65b388d048
|
合并dev分支代码
|
7 years ago |
|
wei.peng
|
af8f8884a2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
120ea87da8
|
动态接口集成 Bug修复
|
7 years ago |
|
Silliter
|
f509514233
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
4d9b1efb69
|
MES 生产计划枚举
|
7 years ago |
|
Silliter
|
ac52608e22
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yihang.lv
|
a464028a3b
|
新增初始化
|
7 years ago |
|
yunhao.wang
|
9c54bc6f9d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
6960275e3b
|
DdlPack，日期封装bug
|
7 years ago |
|
alwaysfrin
|
64350cce31
|
DdlPack，日期封装bug
|
7 years ago |
|
Silliter
|
df714efc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
jessica.chen
|
887121580b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jessica.chen
|
8e5a26bc63
|
修改是否指定条码枚举
|
7 years ago |
|
wei.peng
|
15901e3fe1
|
自定义表单拦截器开发1.0完成
|
7 years ago |
|
Silliter
|
d885d6b877
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yihang.lv
|
63d0178cfd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
93f4d1cfd7
|
发布列表接口
|
7 years ago |
|
alwaysfrin
|
19b78c4148
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
bec70bc79d
|
DdlPack，数字equals添加大于0的约束
|
7 years ago |
|
jiajack
|
a7450b71fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jiajack
|
3980e05d2b
|
mes新增通用功能可配置的业务-完善
|
7 years ago |
|
alwaysfrin
|
d0cac648f3
|
添加update通过DdlPack
|
7 years ago |
|
alwaysfrin
|
b80cda2439
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
0f637fe2f7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
jimmy
|
58ec3e9323
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
a745015be7
|
移库单指定条码枚举
|
7 years ago |
|
yihang.lv
|
542052815b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
9dca4f2dbb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
eda257bf23
|
盘点PDA端，输入数量校验
|
7 years ago |
|
yihang.lv
|
18c6a72b3e
|
订单类型枚举
|
7 years ago |
|
yihang.lv
|
bb2d5f905a
|
ids改为idsStr
|
7 years ago |
|
Silliter
|
4b440fc1f3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yunhao.wang
|
5a4c85e409
|
消息附件管理
|
7 years ago |
|
Silliter
|
4c0116b082
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yunhao.wang
|
6d8643da0c
|
权限分配调整接口
消息调整添加微服务支持
添加sweb通知处理队列
|
7 years ago |
|
yunhao.wang
|
1d9dd174e9
|
前端联调接口优化
单号生成工具类bug解决
|
7 years ago |
|
alwaysfrin
|
7f10c22613
|
部分细节调整
|
7 years ago |
|
wei.peng
|
d70eec3967
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
9802d19b2e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
f1993e69c8
|
sweb目录调整
|
7 years ago |
|
wei.peng
|
82d472466b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
cc3b1a741c
|
元素虚拟属性封装
|
7 years ago |
|
jiajack
|
3a5f43f97b
|
删除iml文件
|
7 years ago |
|
wei.peng
|
f810e35873
|
自定义表单 数据操作接口 DAO 层优化
|
7 years ago |
|
Silliter
|
c90dca9b05
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
2df3b92103
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
9d047fa3e5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
1adc8e4baf
|
自定义表单 数据操作接口 DAO 层完成
|
7 years ago |
|
Silliter
|
a22492193e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
柯裕
|
152bcdf9ce
|
优化质检明细枚举
|
7 years ago |
|
Silliter
|
7e0f4b031f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yunhao.wang
|
cb1b5f9fdb
|
bug修复
|
7 years ago |
|
wei.peng
|
5b0d4f8d37
|
元素增删改查 DAO层接口完成
|
7 years ago |
|
gragon.xu
|
712ec2af7e
|
单据状态描述
|
7 years ago |
|
alwaysfrin
|
1371f94838
|
熔断返回信息封装
|
7 years ago |
|
Silliter
|
e82f1fe49c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
87aa6644fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
76cbc39fe1
|
新增自动填充null值属性
|
7 years ago |
|
Silliter
|
be9edbce54
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
柯裕
|
6f7258d49b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
edee3a7312
|
优化枚举
|
7 years ago |
|
alwaysfrin
|
fdb9e655c3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
6971fdbf60
|
删除json序列化not_empty限制
|
7 years ago |
|
Silliter
|
3c5d6cadf9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
f0b666b502
|
优化
|
7 years ago |
|
Silliter
|
9c7665d354
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
2830bd0376
|
hql封装优化
|
7 years ago |
|
Silliter
|
e61669dd98
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
gragon.xu
|
fb78a04969
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
863b7b0d61
|
移动单条码的行号不做为查询条件
交易处理组件：出入移库：移动单明细可能没有关联单据，所以只能根据源库位类型和质量状态更新库存相应数量
|
7 years ago |
|
jessica.chen
|
426b2e8952
|
质检枚举修改
|
7 years ago |
|
alwaysfrin
|
7876ab6475
|
hql封装优化
|
7 years ago |
|
jimmy
|
6755e5ade3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
4ba121d7c9
|
架构修改基础方法
|
7 years ago |
|
Silliter
|
36034d4925
|
查询优化
|
7 years ago |
|
Silliter
|
261c9bea38
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
gragon.xu
|
a7370f4cc0
|
调用获取单号
|
7 years ago |
|
Silliter
|
92c5457521
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
gragon.xu
|
2b91b9a1d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
59b086dc5d
|
BaseBean.findByHqlWhere:查询别名代码错误
WmsHqlPack:修改封装方法使用DdlHqlPack
任务合并代码错误
|
7 years ago |
|
wei.peng
|
d59318a024
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
ccce8c009c
|
级联功能接口完成
|
7 years ago |
|
Silliter
|
b9d013280f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yihang.lv
|
87895eb194
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
709c018fb4
|
Sweb更新到订单明细修改历史记录查询
|
7 years ago |
|
yunhao.wang
|
cb6b06cb6a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
97e0889971
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
4f0e3756df
|
优化调整
|
7 years ago |
|
yunhao.wang
|
faa8a0d1c7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
865add1f7f
|
按钮功能接口
|
7 years ago |
|
Silliter
|
ee1488d28e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
gragon.xu
|
6b8ac6240d
|
LINK_ORDER_TYPE无需数值
|
7 years ago |
|
Silliter
|
e8deda24fe
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
amy
|
ecdd1d45de
|
是否散件枚举添加
|
7 years ago |
|
Silliter
|
fe644066af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
244494d77b
|
hql封装优化
|
7 years ago |
|
wei.peng
|
04ed151d45
|
元素管理接口完成(未测试)
|
7 years ago |
|
Silliter
|
38311760a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
jimmy
|
cd00bdd954
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
3c2a345b93
|
盘点pc端
|
7 years ago |
|
wei.peng
|
93f4745afd
|
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
# pom.xml
|
7 years ago |
|
wei.peng
|
7190c8ff6f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
045c68ee2e
|
数据对象管理接口开发完成
|
7 years ago |
|
柯裕
|
3d8b3983c3
|
优化枚举
|
7 years ago |
|
gragon.xu
|
ff4c50c5f1
|
枚举统一
|
7 years ago |
|
gragon.xu
|
0ed4691114
|
枚举统一
|
7 years ago |
|
gragon.xu
|
8b3b37260e
|
枚举统一
|
7 years ago |
|
Silliter
|
e8de83b696
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
afa2ac746a
|
定时获取库存移动信息开发
|
7 years ago |
|
Silliter
|
dbeb965e9b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
wei.peng
|
e4adb35413
|
自定义表单 数据对象 新增接口完成
|
7 years ago |
|
wei.peng
|
e4a3b95f16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
1049a11576
|
自定义表单 数据对象 新增接口完成
|
7 years ago |
|
jessica.chen
|
c500681b5d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jessica.chen
|
00ee87f645
|
新增NC处理的操作类型枚举
|
7 years ago |
|
wei.peng
|
f039095f83
|
数据对象实体更新
创建数据对象 Model
|
7 years ago |
|
gragon.xu
|
a8f3307237
|
定时任务循环记录异常
|
7 years ago |
|
Silliter
|
2d6e3b5545
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yunhao.wang
|
635cc27eb0
|
自定义表单布局接口
自定义表单菜单接口
自定义表单功能接口
|
7 years ago |
|
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
1897d227e6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
ea2eb6103d
|
优化调整
|
7 years ago |
|
Silliter
|
dd0af51d8f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
4aaa9bc03a
|
1.优化流程管家
2.开发条码打印，订单打印，收货回执打印
|
7 years ago |
|
wei.peng
|
bfd99830b6
|
FindBugs 提示Bug 修改
|
7 years ago |
|
Silliter
|
6396056d08
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
3ec56056d3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
1dcdf36537
|
添加mes、mes-pcn、sweb三个微服
|
7 years ago |
|
wei.peng
|
01ee15e67a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
569e872ebc
|
自定义表单枚举添加
|
7 years ago |
Jack.lv
|
b9d00d181e
|
条码枚举
|
7 years ago |
|
Silliter
|
b1f195a185
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
gragon.xu
|
557f21bf6a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
bd6f6c0546
|
交易处理组件V2.0：库存交易表中数量类属性与库存表保持一致
|
7 years ago |
|
Jack.lv
|
73d2da12ed
|
po版本枚举
|
7 years ago |
|
Silliter
|
2e020d7be2
|
修改枚举类
|
7 years ago |
|
Silliter
|
dcfb0f5cdf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
738db8d837
|
条码打印开发，角色微服务提供
|
7 years ago |
|
jimmy
|
f52b3ff189
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
8da671628c
|
盘点PC
|
7 years ago |
|
Silliter
|
e1519f832f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
148d808129
|
枚举添加数据状态字段
|
7 years ago |
|
Silliter
|
618ce5d560
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
c4ef1e66f3
|
开发条码打印后端
|
7 years ago |
|
wei.peng
|
8ec8dba414
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
7e9704db00
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
fd6552b4ac
|
定时任务封装
|
7 years ago |
|
Silliter
|
9ee4956924
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
柯裕
|
2b848e18e0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
a495ea2fce
|
更新质检枚举
|
7 years ago |
|
Silliter
|
6464cbd533
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
d62910737b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
5951d7fad8
|
schedule定时任务调整，fallback熔断机制改为factory模式
|
7 years ago |
|
Jack.lv
|
20cea81ea2
|
初始化状态为新建 枚举新增
|
7 years ago |
|
gragon.xu
|
a4301ce4b2
|
redis.pusHashMap
|
7 years ago |
|
gragon.xu
|
48161d95a1
|
枚举冲突
|
7 years ago |
|
gragon.xu
|
e7fa2f3abf
|
NC,盘点交易处理组件
|
7 years ago |
|
crish
|
249ca7f372
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
crish
|
114816d483
|
删除多余枚举类
|
7 years ago |
|
alwaysfrin
|
1c7d601922
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
c4a9a4ac1e
|
解决id重复问题
|
7 years ago |
|
Silliter
|
62196df6bf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
aa1b4ac805
|
定时获取库存移动信息开发
|
7 years ago |
|
Silliter
|
142e2b47c9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
74b63d8a72
|
开发流程管家根据任务创建流程
|
7 years ago |
|
alwaysfrin
|
550f15cb35
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
207b7ea7eb
|
解决id重复问题及shiro授权bug
|
7 years ago |
|
Silliter
|
11a2a72917
|
枚举类加入禁用、启用、全部
|
7 years ago |
|
Silliter
|
41a1cc46e8
|
枚举条码状态调整
|
7 years ago |
|
Silliter
|
de5760bba1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
c0841bb89c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
crish
|
24b38fefb0
|
入库添加枚举类
|
7 years ago |
|
gragon.xu
|
85d3463348
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
e1825eac40
|
交易处理组件ALL
|
7 years ago |
|
Silliter
|
d604b42c1d
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
Silliter
|
e4600e1c01
|
定时获取库存移动信息开发
|
7 years ago |
|
alwaysfrin
|
ab63dadb1c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
8ac4046a7d
|
开发校验权限和获取个人任务列表公用方法
|
7 years ago |
|
wei.peng
|
0a5c19ebe5
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
柯裕
|
d2190c55c7
|
解决冲突
|
7 years ago |
|
柯裕
|
8edf27d389
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
9a6a9018cf
|
更新枚举
|
7 years ago |
|
wei.peng
|
6835593401
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
03fe15e2f4
|
自定义报表优化
|
7 years ago |
|
Silliter
|
cc4484a562
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
gragon.xu
|
201f960d08
|
冲突
|
7 years ago |
|
gragon.xu
|
31d91f48b3
|
收货交易处理组件开发
|
7 years ago |
|
柯裕
|
398a3d98c5
|
更新POJO
|
7 years ago |
|
Jack.lv
|
ed7857b86d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Jack.lv
|
b667d6840e
|
获取权限和根据权限获取任务列表
|
7 years ago |
|
jimmy
|
89bd80ea21
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
jimmy
|
d41a4f0dc9
|
提交NC枚举
|
7 years ago |
|
alwaysfrin
|
8967fd21e6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
576743ed18
|
自定义表单，动态对象工具
|
7 years ago |
|
wei.peng
|
1e18495617
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
1bdc307a1b
|
自定义报表 折线图功能完成
|
7 years ago |
|
yunhao.wang
|
62987c7d0f
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |