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
19afeb92b7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fea0d476a4
基础操作,数据补全
6 years ago
0e15934d16
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6a3662283b
枚举修改赋值
6 years ago
0ed90485a6
安灯基础数据导入导出
6 years ago
6ba7a43ea7
Merge branch 'dev'
6 years ago
4350a82043
1. 完善脚本引擎
6 years ago
353b8a37c5
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
e1824dbba4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c858475bd2
用户权限调整 部门权限调整完成
6 years ago
24f7ae3471
Merge branch 'test'
6 years ago
3a19888ddf
用户权限调整 岗位功能调整完成
6 years ago
53d34096f7
Merge branch 'dev' into test
6 years ago
8e39e6d9fb
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
0041ce328e
定时删除日志
6 years ago
78cd5dc77e
用户权限调整
6 years ago
d9ef2677fb
Merge branch 'dev' into test
6 years ago
f4613c2f5c
Merge branch 'test'
6 years ago
1b1bc67c90
用户权限调整
6 years ago
61ecc2a74f
Merge branch 'dev' into test
6 years ago
fba99de795
枚举修改
6 years ago
d47c9f8650
合并冲突pojo
6 years ago
f0e0867e2c
库存移动pojo新增字段
6 years ago
a1f8ca3096
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d2839f6cf2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
58b067e3cc
库存报表存储区级联子存储区查询
6 years ago
5741bfa2e6
Merge branch 'test'
6 years ago
5bed1d27ec
Merge branch 'dev' into test
6 years ago
79b36a30a4
冲突合并
6 years ago
fe3d392e9b
新增枚举信息
...
移库单明细表冗余主表临时字段
新增物料表字段
6 years ago
f3eb8d2356
Merge branch 'dev' into test
6 years ago
541b40d182
合并代码
6 years ago
53135c27f5
Merge branch 'test'
6 years ago
b39d7038fa
Merge branch 'dev' into test
6 years ago
dec3743911
流程管家推队列查询条件没有封装
6 years ago
2cbc082c7b
动态对象 空数据处理
6 years ago
eeefb843b4
Merge branch 'test'
6 years ago
37b8755485
Merge branch 'dev' into test
6 years ago
d3deaa6081
安灯bug解决
...
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
6 years ago
e43c493463
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
994da92b4e
交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG
6 years ago
c02d22ecba
Merge branch 'test'
6 years ago
b18d393fe0
Merge branch 'dev' into test
6 years ago
e95db40c23
123
6 years ago
543171dfbb
Merge branch 'dev' into test
6 years ago
1ac5542541
动态表单分页功能完成
6 years ago
c436c8ee3d
Merge branch 'test'
6 years ago
e3354f52bd
Merge branch 'dev' into test
6 years ago
92daec97e3
枚举修改名字
6 years ago
b8730fac47
Merge branch 'dev' into test
6 years ago
ac5bf14d6b
动态表单动态操作 功能优化
6 years ago
15386ae5c2
枚举
6 years ago
628f1db31c
Merge branch 'dev' into test
6 years ago
ff9a5dcd17
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
98de08ba4a
文件上传优化
...
字段删除异常
日志添加索引
6 years ago
96264870c2
Merge branch 'dev' into test
6 years ago
efbe9dac9e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bf02cbf8a4
PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
6 years ago
99710d5c20
Merge branch 'test'
6 years ago
9c38ed702a
Merge branch 'dev' into test
6 years ago
97adebba21
枚举新增 实体字段新增
6 years ago
3b1d19bbab
Merge branch 'dev' into test
6 years ago
a8dee4713a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
31f6f4deef
枚举字段新增AMP
...
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
6 years ago
1b569ff3a8
ERP同步标识枚举添加
6 years ago
f4bf536296
Merge branch 'test'
6 years ago
ee5a4f1dfe
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
0962b810ce
Json 转换精度丢失
6 years ago
5d2695a5cb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a551249165
Merge branch 'dev' into test
6 years ago
2e5b7466c8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1b4e5143aa
用户单帐号多平台登录
6 years ago
364efedc42
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c783d9119c
任务列表查询查出了状态为30的任务+流程处理组件execute方法提升事务级别+枚举添加根据枚举名查找枚举详情的静态方法
6 years ago
d39c16c5d5
Merge branch 'test'
6 years ago
49d35f264e
Merge branch 'dev' into test
6 years ago
35f92b05e3
1. 修改ERP接口暂存表的字段，增加关联单据类型
6 years ago
1ee9cb24f2
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
7861048e31
Merge branch 'test'
6 years ago
2ce560b39f
生产报工明细实体修改和枚举新增
6 years ago
470d319504
Merge branch 'dev' into test
6 years ago
3cc4aec00a
库存预警看板
6 years ago
2f1a3080ba
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
05c56e46b4
库存预警看板开发
6 years ago
176f9ffd5f
Merge branch 'test'
6 years ago
713503d7ff
Merge branch 'dev' into test
6 years ago
5d1447c92a
1. 解决标准拣货多级存储区查找的问题
6 years ago
41324abdad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
854ee5b3cf
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
6 years ago
0f3d67d110
供应商收货看板功能完成
6 years ago
8347085f26
冲突
6 years ago
e3d5e5bb19
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
6 years ago
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
f32f7e72a2
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
f3151cbbe3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e13d4163b7
库存交易报表代码提交
6 years ago
a4016dc911
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
34dcf6d526
枚举修改
6 years ago
33ec897657
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
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
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
32cc1db3bf
Merge remote-tracking branch 'origin/dev' into test
6 years ago
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
ea83820fbf
新增物料类型跟单位类型
6 years ago
b3272dc3d7
冲突
6 years ago
fe13a43ccc
WmsEnumUtil冲突（几步法）
6 years ago
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
bec3a7098d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
16bb8d6714
Merge remote-tracking branch 'origin/dev' into test
6 years ago
8e41b40196
excel工具类优化
6 years ago
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
ac8b9d3986
Merge remote-tracking branch 'origin/dev' into test
6 years ago
b7a7eb29ae
安灯类型 查 表 已从表改为枚举
...
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
6 years ago
68fadff818
Merge remote-tracking branch 'origin/dev' into test
6 years ago
2adff745fb
自定义表单 功能优化
6 years ago
0fb7e05e88
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
10c276fb16
自定义数据源
6 years ago
511df468ec
Merge remote-tracking branch 'origin/dev' into test
6 years ago
13af329513
动态查询Cloud 服务基础功能已完成 1.0
6 years ago
a58888df85
Merge remote-tracking branch 'origin/dev' into test
6 years ago
c4dceace92
增加动态报表对外接口-批量修改
6 years ago
878108e86f
Merge remote-tracking branch 'origin/dev' into test
6 years ago
f2b19055d4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3630f0c2f1
动态查询Cloud 服务基础功能已完成
6 years ago
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
1a7cda72d3
Merge remote-tracking branch 'origin/dev' into test
6 years ago
27e4fc8ec2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
28ae6cf85d
Merge remote-tracking branch 'origin/dev' into test
6 years ago
aec4b9a85a
自定义表单 多数据源 功能完成
6 years ago
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
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
7ef2eb0c6e
报表 表单打通
6 years ago
f6d70a2781
Merge branch 'dev' into test
6 years ago
bleakney.liu
汪云昊
陈思洁
crish
jenkins
WYnneaoapc
wei.peng
曾贞一
王杰
刘敏
于学杰
jimmy.zeng
许心洁
peter.pan
jenkins
jenkins
sky.meng
shiyanghuan
alwaysfrin
wei.peng
Silliter
allen.zhang
柯裕