67461457fc
Merge branch 'dev' into test
6 years ago
1e0f0c706c
安灯问题修复
6 years ago
f093a97cf0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
4eaa8b5b17
导入导出
6 years ago
6902c79472
问题清单问题修复
6 years ago
7d8b8664cc
问题清单问题修复
6 years ago
王杰
56996126be
【需求：1101，mes同步设备安灯维修任务】
6 years ago
73aef5326c
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
d0b98f0869
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
00e849a62e
(1089 过程质量检测基础数据；1090 返厂返修基础数据)
6 years ago
3bc277178e
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
e15e402890
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
0c20a2b655
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
ca0cf21a7c
【NC解冻-4.2 组件复用】PR12-01~PR12-02
6 years ago
a537daee62
导出不导出有效性
6 years ago
caf6dc17ab
【NC冻结】nc冻结
6 years ago
44fccb14d6
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
王杰
09cff08e1e
[需求1086，设备点检保养作业，第2次提交]
6 years ago
d5864ba490
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
5e78c31a70
LAC 名称修改
6 years ago
15e812c7a6
Merge branch 'test'
6 years ago
9558225174
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
87ffdfd9a3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ac7b0415ba
1083 添加枚举字段
6 years ago
5c67a7bb5f
MySQL 数据库不支持 CAST AS DOUBLE，需要改成 CAST AS DECIMAL
6 years ago
0526da8ee3
Merge branch 'test'
6 years ago
cd74f5336f
Merge branch 'dev' into test
6 years ago
王杰
fa25769c50
mes枚举
6 years ago
e89df89f9a
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
0d0178545c
mes设备
6 years ago
e8336c85d7
idea 异常 文件格式化
6 years ago
7139d9b5f1
解决冲突
6 years ago
9e4930968f
解决冲突
6 years ago
8a517bc0b9
返厂返修增加字段
6 years ago
febbea09c3
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
0fdabe4950
知识库 ，自处理开发
6 years ago
1de89d732b
本地误拉了test代码，解决pom
6 years ago
9f9874902d
冲突解决
6 years ago
曾贞一
e603ac66a7
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
5a036f14cb
mes设备作业任务
6 years ago
7fc439319e
返厂返修
6 years ago
413266293e
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
030391a93c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
56d7457826
工位监控提交
6 years ago
曾贞一
5e7fb00d0c
【生产领料】
6 years ago
1f1b4f7511
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
48a6cdc39c
作业任务：作业类型 枚举增加
6 years ago
e260045c42
Merge remote-tracking branch 'origin/test' into test
6 years ago
97763d6b53
安灯广播， 安灯管理显示不同界面， 添加操作来源字段
6 years ago
王杰
b561110e54
Merge branch 'dev' into test
6 years ago
王杰
9cc89f9397
mes设备周期计划
6 years ago
2f843a8f5a
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
986157043d
流程设计：新增组件参数类型：可配字符串
6 years ago
王杰
611b25abfd
Merge branch 'dev' into test
6 years ago
d91fa61c88
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
6c1891c193
软适配报文状态及微服务接口调整
6 years ago
05fd0fe686
WebService Server 优化完成
6 years ago
7863325afd
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
6 years ago
b7b78b85ac
误拉了test分支的代码：还原
6 years ago
d351c36ffc
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
c681340355
工位监控添加枚举一字段
6 years ago
52a5fe74af
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
029f14d36f
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/bean/MesDatasource.java
6 years ago
83a7a9e988
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
d9dd10761e
WebService 欧洲对接完成
6 years ago
王杰
2ed8ebdbd7
Merge branch 'dev' into test
6 years ago
0e7c7fbfb2
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
45b4264c67
导出显示bug修改
6 years ago
1758a4e50e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
a79769d229
mes-pcn枚举
6 years ago
王杰
37f7e92d53
mes实体类
6 years ago
8deff73454
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
508d4b5aba
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/SuitServerModel.java
6 years ago
d83de01d33
服务端适配日志bug解决
6 years ago
722146acd8
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
417b4a09db
代码格式优化增加枚举
6 years ago
d406532b37
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1e5e35ee6f
Pojo 合并代码
6 years ago
fe1e83609e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f3867c64f4
软适配微服务接口
6 years ago
61a38c9acd
WebService Server 优化完成
6 years ago
a961da57ef
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
778c1a79a7
【静态盘点】增加库存调整盘点
6 years ago
dc3fd624f2
Merge branch 'dev' into test
6 years ago
219b2d2ad3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
104d308d30
PLC DB 设备故障 过程质量检测
6 years ago
8148fc86e6
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
c39462cd35
安灯广播
6 years ago
b22c6fbcaf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
王杰
d814887570
mes设备
6 years ago
b43f4aef72
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
73b8fd1de4
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
09ea0929e4
枚举
6 years ago
a791430fec
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
df6f432534
1012 修改绑定关键件 和 工序bom添加isBindKey
6 years ago
f778b15ea5
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
40321ed7ec
Merge branch 'test'
6 years ago
4e2373bdae
Merge branch 'dev' into test
6 years ago
20843e06a6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4654fad2bd
1011 生成条码工步
6 years ago
91fada5cc0
枚举修改
6 years ago
672438f2c0
Merge branch 'test'
6 years ago
b6179f9f71
Merge branch 'dev' into test
6 years ago
be63f4eab9
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
37e2a88ca7
物理安灯和软件安灯插入安灯附属表的逻辑
6 years ago
04cdf58aef
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
658b25bd65
格式化代码
6 years ago
3ebf17adb1
格式化代码
6 years ago
926c9c3d60
方法移值
6 years ago
0924810e64
Merge branch 'test'
6 years ago
d11058019b
枚举
6 years ago
cf3ee95623
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6596931124
枚举
6 years ago
56f7048098
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
4b032ac426
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
16073eb7e5
安灯附属表插入时， 完整数据； 添加安灯来源接口
6 years ago
89ab1816e3
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
8d7c77d3ed
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71a68e8cf6
枚举
6 years ago
c955047746
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1769e7765f
加了main方法发版报错
6 years ago
王杰
95cc0b433e
mes组织模型bug修复
6 years ago
王杰
18bc35f60d
Merge branch 'dev' into test
6 years ago
c67fe92297
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3e8bcbeb84
枚举
6 years ago
60f441e685
Merge branch 'dev' into test
6 years ago
d495046dcf
添加XML 工具实现
6 years ago
473e2caea0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2cf4759c21
枚举
6 years ago
60d1798b9c
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
王杰
ddfb47e6ac
mes设备台账功能开发
6 years ago
1e41ab2e39
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
9553e962e3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bd55a18bf6
微服务接口 - 打印模板分页查询
6 years ago
232c675444
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
d2c3045575
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
84a96a22fa
新加NotNumBiggerPackContainsZero方法
6 years ago
4477820c1b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
68b0058e1b
枚举
6 years ago
1defd0d8be
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
a11eeae45c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ee11674ab
读取托盘
6 years ago
曾贞一
e24474fc8c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
2b62357ab5
VDA收货【生产快速入库】组件，任务编号1051
6 years ago
cecd37a1e7
添加Xml 工具
6 years ago
1d17198daf
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
ac1c18581e
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
d8c740819c
FTP适配器
6 years ago
61804a27b3
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
ddf1d2e6dc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5a5b7b882e
条码模型
6 years ago
4ceba7144c
【物流线路修改】 修改枚举值重复问题
6 years ago
10fcc569bd
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
8beee972a9
【物流线路维护】 增加处理模式类型
6 years ago
e9f82d9259
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
692110b92b
【物流线路维护】增加前端处理模式枚举
6 years ago
e35cf183da
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
42a8fb357f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
82fe491bd3
#1050 工位监控
6 years ago
7a403a37da
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
4409f34e0f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3ef7d24eab
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
3cc1997ae2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c2da7410eb
新增枚举提交
6 years ago
e20ee7b1ff
安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤
6 years ago
fe174a47ee
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
fb9340fc09
安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑
6 years ago
30eee05b1c
Merge branch 'dev' into test
6 years ago
766d195088
开线合并代码
6 years ago
183fd78eac
冲突解决
6 years ago
99382a8fca
Merge branch 'dev' into test
6 years ago
eb70017396
Xml 解析添加重试机制
6 years ago
曾贞一
bc83b57f8e
合并代码
6 years ago
曾贞一
fb86682652
VDA 生产快速入库
6 years ago
0982f01eb2
Merge branch 'dev' into test
6 years ago
26684524f1
生产报工组件和生产报工标签组件提交
6 years ago
7e3edd06a0
Merge branch 'dev' into test
6 years ago
22fbbe2a91
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
edfc78995b
新增打印机配置表
6 years ago
3b46d242a7
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
d830c78d03
FTP适配器
6 years ago
4e303413ff
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c0fc2c36bf
Socket 适配器完成
...
MQ 适配器完成
6 years ago
王杰
80f50fe800
Merge branch 'dev' into test
6 years ago
王杰
804574090f
pcn生产工单
6 years ago
a601d5ddf3
orderBy方法去掉为空判断
6 years ago
9ae6ee5016
Merge branch 'test'
6 years ago
51c21f2c22
Merge branch 'dev' into test
6 years ago
d8824ab066
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
4173f0637f
安灯正式环境发布
6 years ago
曾贞一
8a89b95ebf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
cd8a5df991
VDA 生产快速入库组件开发
6 years ago
829171f8a4
Merge branch 'dev' into test
6 years ago
ef6c47dc35
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e42cd80b8b
条码打印枚举添加待退料状态
6 years ago
9e12bb5da3
Merge branch 'dev' into test
6 years ago
87dfdc6471
增加方法notInPackArray（）， 修复工具类 notInPack() notInPackString()方法无效的问题
6 years ago
f96cbd1be3
Merge branch 'dev' into test
6 years ago
033b23321f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7c472b386a
提交
6 years ago
355cd49649
注释 WebService 发送邮件客户端
6 years ago
790c0b4ec6
Merge branch 'dev' into test
6 years ago
7131271edc
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
cbc5882bd5
Merge branch 'dev' into test
6 years ago
王杰
d676bcf974
mes生产工单下达配置状态
6 years ago
c10bf2e3e1
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
4b17c6ca69
Merge branch 'dev' into test
6 years ago
王杰
310d0f0606
mes生产工单审批
6 years ago
曾贞一
d07173bd64
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
dcc13e622b
Merge branch 'dev' into test
6 years ago
5cb2e7994b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cf64f0118a
提交
6 years ago
f3f77e63b3
Merge branch 'test'
6 years ago
4d5497929a
Merge branch 'dev' into test
6 years ago
a9e369e716
任务枚举添加导出转换方法
6 years ago
0b8bc114bc
服务端调整
6 years ago
2d911c4257
安灯优化
6 years ago
27a7aa960c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
37701bed62
提交
6 years ago
c47c617aab
Merge branch 'dev' into test
6 years ago
王杰
8570b88761
mes生产工单
6 years ago
c17039ce4a
Merge branch 'dev' into test
6 years ago
4e1635fe7e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9b0c5de954
提交
6 years ago
曾贞一
6c8cfd8678
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
52a770ad45
Merge branch 'dev' into test
6 years ago
王杰
24a31c0bdf
生产工单实体
6 years ago
541ea98d98
Merge branch 'dev' into test
6 years ago
a9a318e354
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
61b0dfdc3b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
809478be44
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d8bc8d713d
条码打印model字段添加
6 years ago
41588f37d7
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d1d7e65f97
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
c7ed8613d6
软适配添加WebService 默认处理
6 years ago
83f400a36b
sql 注入 删除斜杠
6 years ago
b31162c5d6
安灯工位放行， 安灯任务管理界面数据权限控制
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
f6bb2ee21f
Merge branch 'dev' into test
6 years ago
曾贞一
337e5f7084
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
f17c1d3d25
推荐入库 组件开发
6 years ago
王杰
2460fbc3b4
生产计划
6 years ago
564deb4d6b
适配记录及数据库适配器
6 years ago
3474bb82c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f978ee39c8
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f6c1eff0f1
excel通用导入优化
6 years ago
d120b1615a
国际化工具类
6 years ago
ee979c6e02
Merge branch 'dev' into test
6 years ago
9caf9a4458
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2f904f9eee
数据库适配器
6 years ago
c27449a185
异常信息国际化
6 years ago
d23045a667
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5b6477bba6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
510485d2f0
excel导出优化--单据状态显示枚举描述
6 years ago
51974a46b9
WebService 调用发送邮件测试
6 years ago
35beb0c60e
Merge branch 'dev' into test
6 years ago
377a875fec
软适配客户端代码结构调整。
6 years ago
fc1c7ab797
软适配添加-所有适配命令 接口
6 years ago
2c6b223628
软适配客户端代码结构调整。
6 years ago
212cfb02af
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
71798e9f51
软适配功能配置优化
6 years ago
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
07688db533
软适配实体
6 years ago
74bdaccfbd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8ed0d4d60e
枚举维护业务类型数据
6 years ago
f2e2dd1670
软件适配器 数据源适配器
...
单号生成高并发优化
6 years ago
21241e45ca
软适配功能配置优化
6 years ago
5144d15ac4
采购单报表开发
6 years ago
bbfc9b320f
Merge branch 'test'
6 years ago
4a1ad40dfa
Merge branch 'dev' into test
6 years ago
b899c5c8c5
软适配 WebService 功能接口开发
6 years ago
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
9ec5e63da6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5b200f824f
软适配 WebService 功能开发
6 years ago
3eef8ea750
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
029d7eac62
软适配model
6 years ago
2d376575a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3c6d17a283
修改pojo数据类型
6 years ago
ccffe9b7bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c44a99eb40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
61a7985afc
提交 0905
6 years ago
5b97a9e0cb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
241a478f65
excel导出优化--单据状态显示枚举描述
6 years ago
8d8752b8b4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
89b0a4a68a
条码打印调试
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
f0fba5e23a
盘点枚举添加--excel导出
6 years ago
曾贞一
b7bd96fa44
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
64aed1f49c
开发 Restful 接口测试PDA
6 years ago
8f1ac3fdae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f370f377d4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ce78b170f
工作参数枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
0a3339ba8d
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ff462900b7
枚举描述添加
6 years ago
2e8a70d8b4
pom版本还原--pojo
6 years ago
王杰
482159b322
mes-pcn定时任务枚举修改
6 years ago
53a08621fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
db4f6bcdb1
流程管家：添加作业记录明细（快速流程每一次扫条码都会生成一个新的移动单）
6 years ago
b760543b3b
excel通用导入优化
6 years ago
a5b01bbaae
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
69d2932ca4
http请求增加不需要设置请求内容枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
3a1cf7a2b7
判断属性是否有final修饰
6 years ago
b4b095c970
判断属性是否有final修饰
6 years ago
4d5c92df78
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
d5cfe77ac5
mes定时任务枚举
6 years ago
32502582c1
新增属性初始化
6 years ago
eadb86ce60
excel通用导入优化
6 years ago
fb3b8a033d
excel通用导入优化
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
5e06022e51
Merge remote-tracking branch 'remotes/origin/dev'
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
9c26f45cd5
明细状态枚举添加
6 years ago
王杰
2e86ff81d0
mes工作单元参数增加枚举
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
5c48b2eb79
Merge branch 'dev' into test
6 years ago
035a8b5924
定时任务日志信息优化
6 years ago
90439f55fd
添加 XStream 插件
6 years ago
c4db15db9b
添加 XStream 插件
6 years ago
47238f131b
Merge branch 'test'
6 years ago
8daa2789a4
Merge branch 'dev' into test
6 years ago
7181e85ba5
安灯导出实体注解
...
定时任务日志添加字段
6 years ago
6598a829e0
Merge branch 'dev'
6 years ago
ccf0764ee6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
812be94ed3
Merge branch 'dev' into test
6 years ago
7f35883b08
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
90fb9d3190
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
fb743ebafc
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
409cbb8492
Merge branch 'dev' into test
6 years ago
4a717ec544
直送发运JOB+交易处理程序（下线结算）逻辑变动
6 years ago
f4141fd2c6
Merge branch 'dev' into test
6 years ago
曾贞一
60feef4bb5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
2240819def
发泡打箱包装
6 years ago
6e2cf70951
库位校验枚举添加
6 years ago
49a936c660
Merge branch 'dev' into test
6 years ago
06bd10152c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7f1ef0bca7
自定义报表表单打通， 用户在线设置功能优化
6 years ago
d63974140d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
af2e1a811c
andon组织模型导入功能
...
andon删除关联数据校验
6 years ago
577e1372ab
Merge branch 'dev' into test
6 years ago
a064c6b84a
枚举新增条码类型
...
库存条码表新增字段
6 years ago
ad09180809
Merge branch 'dev' into test
6 years ago
c1ca7cbcae
Andon组织模型操作接口
...
Andon班次计算调整
6 years ago
4149183450
Merge branch 'dev' into test
6 years ago
c11cc65e8f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
d7b79c659c
WMS获取系统配置信息
6 years ago
0526fcf05c
Merge branch 'dev' into test
6 years ago
crish
王杰
许心洁
jokelone
lpx
qianhs
wei.peng
陆卫豪
WYnneaoapc
汪云昊
刘辉
曾贞一
陈思洁
changjiang.gao
lbwgithub
jenkins
刘敏
于学杰
jimmy.zeng
peter.pan
jenkins