汪云昊
|
69525fbaa9
|
表单菜单排序
|
6 years ago |
 曾贞一
|
cef48801df
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
7455c6c640
|
软适配配置文件初始化
|
6 years ago |
wei.peng
|
aee54acafc
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
46c710e559
|
表单功能优化，虚拟属性连表查询，时间格式化对接
|
6 years ago |
|
wei.peng
|
6d99080069
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
jimmy.zeng
|
c986f7b2a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
9ee2901346
|
添加字典分组
优化redis资源键
|
6 years ago |
|
wei.peng
|
66f49f3fdc
|
自定义表单功能调整
|
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 |
peter.pan
|
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 |
|
wei.peng
|
750e4d75dc
|
添加 XStream 插件
|
6 years ago |
|
wei.peng
|
bda52f76c6
|
软适配 Json 请求适配完成
|
6 years ago |
|
peter.pan
|
24bbd75c81
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c7571b4c66
|
IS_GENERAL_TASK 添加单据是否生成任务状态 撤销
|
6 years ago |
|
许心洁
|
60e6d51d35
|
流程管家2.0
|
6 years ago |
|
peter.pan
|
8f977719c0
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
5a7ce32761
|
冲突
|
6 years ago |
|
wei.peng
|
b5c204f873
|
软适配接口制作完成
|
6 years ago |
|
peter.pan
|
5c48b2eb79
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
035a8b5924
|
定时任务日志信息优化
|
6 years ago |
|
wei.peng
|
90439f55fd
|
添加 XStream 插件
|
6 years ago |
|
wei.peng
|
c4db15db9b
|
添加 XStream 插件
|
6 years ago |
|
peter.pan
|
8daa2789a4
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
7181e85ba5
|
安灯导出实体注解
定时任务日志添加字段
|
6 years ago |
|
汪云昊
|
ccf0764ee6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
jenkins
|
812be94ed3
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
7f35883b08
|
登录会话添加设备ID
自定义表单添加数据表唯一教研
自定义表单添加映射类型
|
6 years ago |
|
wei.peng
|
90fb9d3190
|
登录会话添加设备ID
自定义表单添加数据表唯一教研
自定义表单添加映射类型
|
6 years ago |
|
wei.peng
|
fb743ebafc
|
登录会话添加设备ID
自定义表单添加数据表唯一教研
自定义表单添加映射类型
|
6 years ago |
|
jenkins
|
409cbb8492
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
4a717ec544
|
直送发运JOB+交易处理程序（下线结算）逻辑变动
|
6 years ago |
|
jenkins
|
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 |
|
jenkins
|
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 |
|
wei.peng
|
7f1ef0bca7
|
自定义报表表单打通， 用户在线设置功能优化
|
6 years ago |
|
汪云昊
|
d63974140d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
af2e1a811c
|
andon组织模型导入功能
andon删除关联数据校验
|
6 years ago |
|
jenkins
|
577e1372ab
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
a064c6b84a
|
枚举新增条码类型
库存条码表新增字段
|
6 years ago |
|
peter.pan
|
ad09180809
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c1ca7cbcae
|
Andon组织模型操作接口
Andon班次计算调整
|
6 years ago |
|
peter.pan
|
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 |
|
peter.pan
|
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 |
|
wei.peng
|
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 |
|
于学杰
|
4350a82043
|
1. 完善脚本引擎
|
6 years ago |
|
wei.peng
|
c858475bd2
|
用户权限调整 部门权限调整完成
|
6 years ago |
|
wei.peng
|
3a19888ddf
|
用户权限调整 岗位功能调整完成
|
6 years ago |
|
peter.pan
|
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 |
|
wei.peng
|
78cd5dc77e
|
用户权限调整
|
6 years ago |
|
peter.pan
|
d9ef2677fb
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1b1bc67c90
|
用户权限调整
|
6 years ago |
|
peter.pan
|
61ecc2a74f
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
fba99de795
|
枚举修改
|
6 years ago |
|
陈思洁
|
d47c9f8650
|
合并冲突pojo
|
6 years ago |
|
陈思洁
|
f0e0867e2c
|
库存移动pojo新增字段
|
6 years ago |
|
wei.peng
|
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 |
|
peter.pan
|
5bed1d27ec
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
79b36a30a4
|
冲突合并
|
6 years ago |
|
陈思洁
|
fe3d392e9b
|
新增枚举信息
移库单明细表冗余主表临时字段
新增物料表字段
|
6 years ago |
|
peter.pan
|
f3eb8d2356
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
541b40d182
|
合并代码
|
6 years ago |
|
peter.pan
|
b39d7038fa
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
dec3743911
|
流程管家推队列查询条件没有封装
|
6 years ago |
|
wei.peng
|
2cbc082c7b
|
动态对象 空数据处理
|
6 years ago |
|
peter.pan
|
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 |
|
peter.pan
|
b18d393fe0
|
Merge branch 'dev' into test
|
6 years ago |
|
peter.pan
|
e95db40c23
|
123
|
6 years ago |
|
peter.pan
|
543171dfbb
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1ac5542541
|
动态表单分页功能完成
|
6 years ago |
|
peter.pan
|
e3354f52bd
|
Merge branch 'dev' into test
|
6 years ago |