汪云昊
|
eeff3517c6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
# modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
|
6 years ago |
许心洁
|
262f7efe05
|
如果有异常信息需要叠加在提示信息前一起返回给前端
|
6 years ago |
|
汪云昊
|
f2e2dd1670
|
软件适配器 数据源适配器
单号生成高并发优化
|
6 years ago |
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
wei.peng
|
b899c5c8c5
|
软适配 WebService 功能接口开发
|
6 years ago |
|
wei.peng
|
e921bb72d2
|
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/BlockSoftSwitchEnumUtil.java
|
6 years ago |
|
汪云昊
|
029d7eac62
|
软适配model
|
6 years ago |
|
wei.peng
|
e58aaf95b9
|
软适配 WebService 功能开发
|
6 years ago |
jimmy.zeng
|
73b6088977
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
65b336f708
|
任务993+生产报工产生的移动明细单位错误BUG修复+PDA颜色回显完成的明细颜色没有与处理中的区分开BUG修复
|
6 years ago |
|
jimmy.zeng
|
399a51b044
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
27d574314d
|
getList未查到数据要判断+补全所有showInformation区分颜色
|
6 years ago |
|
wei.peng
|
96a29d3de8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
18dac2b569
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy.zeng
|
1b06c1d07f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
2325d18660
|
软件适配器 认证参数接口
|
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 |
|
crish
|
f7b366fe29
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
12a2a27b18
|
mes， pcn条码打印
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
wei.peng
|
884f3e1a96
|
合并代码
|
6 years ago |
|
wei.peng
|
d7b0f30d91
|
IMPP 平台功能功能优化 . 软适适配功能开发
|
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 |
|
汪云昊
|
e83efe76e0
|
软件适配器 测试
|
6 years ago |
|
wei.peng
|
94924cb264
|
POJO 合并
|
6 years ago |
|
wei.peng
|
718ec36747
|
POJO 合并
|
6 years ago |
|
汪云昊
|
f5c0ca9383
|
软适配模型调整
|
6 years ago |
于学杰
|
4235184afc
|
Merge branch 'Process' into dev
|
6 years ago |
|
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
|
许心洁
|
f6c425c649
|
平台获取设备ID方式改变+所有pojo加上序列化
|
6 years ago |
|
许心洁
|
af7b2404dd
|
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
peter.pan
|
d45b7b77f3
|
Merge branch 'dev' into test
|
6 years ago |
刘敏
|
651577d5ad
|
model字段修改（dragon）
|
6 years ago |
|
许心洁
|
bb8078cb94
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
bda52f76c6
|
软适配 Json 请求适配完成
|
6 years ago |
|
许心洁
|
60e6d51d35
|
流程管家2.0
|
6 years ago |
|
peter.pan
|
8f977719c0
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
b5c204f873
|
软适配接口制作完成
|
6 years ago |
jenkins
|
409cbb8492
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
4a717ec544
|
直送发运JOB+交易处理程序（下线结算）逻辑变动
|
6 years ago |
|
jenkins
|
49a936c660
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
7f1ef0bca7
|
自定义报表表单打通， 用户在线设置功能优化
|
6 years ago |
|
wei.peng
|
90048c3f0a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
4f553c0857
|
添加序列化ID , 用户登录在线机制完成
|
6 years ago |
|
peter.pan
|
32a563e053
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
dcb9b59ec9
|
新增一个实体封装
|
6 years ago |
|
peter.pan
|
543171dfbb
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1ac5542541
|
动态表单分页功能完成
|
6 years ago |
|
peter.pan
|
96264870c2
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
bf02cbf8a4
|
PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
|
6 years ago |
|
wei.peng
|
1ee9cb24f2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
a7bfc692fe
|
EXCEL数据通用导出
|
6 years ago |
jenkins
|
470d319504
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
ee440bc487
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
6c7bd177ca
|
文件上传微服务接口优化
excel通用导出优化
任务提示优化
|
6 years ago |
|
于学杰
|
713503d7ff
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
e3d5e5bb19
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
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 |
|
汪云昊
|
6259bd56bc
|
通用EXCEl导出MODEL
|
6 years ago |
|
jenkins
|
25fc477991
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
e9b1d7e595
|
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
|
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
|
db461a76ba
|
增加动态报表对外接口-多条件删除
移除默认属性校验
移除查询数据库所有表的部分字段（部分字段SQLServer不支持）
|
6 years ago |
|
wei.peng
|
c4dceace92
|
增加动态报表对外接口-批量修改
|
6 years ago |
|
jenkins
|
878108e86f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
3630f0c2f1
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
jenkins
|
1a7cda72d3
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
wei.peng
|
aec4b9a85a
|
自定义表单 多数据源 功能完成
|
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 |
yiming.gu
|
ef09b0f41b
|
model取消对mes、andon的引用
|
7 years ago |
allen.zhang
|
8afe54af50
|
Merge branch 'dev' into test
|
7 years ago |
|
yiming.gu
|
85c4f94dcb
|
MES model转移至pojo-mes目录下
|
7 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
alwaysfrin
|
41a8adcea2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
309f3f2282
|
事务调整及demo
|
7 years ago |
|
许心洁
|
8e2e1f6543
|
MES：流程配置添加工序，工步基础数据接口
|
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 |
|
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 |
|
许心洁
|
7cce6b828f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
9a4323614c
|
流程新增与流程设计分开
|
7 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
7 years ago |
Silliter
|
dbfae39ea6
|
安灯项目优化
|
7 years ago |
|
Silliter
|
c9c470a27f
|
开发物理安灯业务
|
7 years ago |
|
Silliter
|
47bd2c0aa7
|
安灯项目开发
|
7 years ago |
|
yiming.gu
|
15b5edfaec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
b1f513d786
|
新增设备pojo，组织模型model
|
7 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
7 years ago |
|
Silliter
|
4e9a8ab787
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
许心洁
|
35690ce138
|
作业流程界面+后端分页查询接口
|
7 years ago |
|
jenkins
|
12e2f1d1b8
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
许心洁
|
19f30ce4f9
|
流程配置+定时处理错误移动单给错误信息赋值过长
|
7 years ago |
|
jenkins
|
850b372ab4
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |