汪云昊
|
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 |
|
陈思洁
|
92daec97e3
|
枚举修改名字
|
6 years ago |
|
peter.pan
|
b8730fac47
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
ac5bf14d6b
|
动态表单动态操作 功能优化
|
6 years ago |
|
许心洁
|
15386ae5c2
|
枚举
|
6 years ago |
|
peter.pan
|
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 |
|
peter.pan
|
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 |
|
peter.pan
|
9c38ed702a
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
97adebba21
|
枚举新增 实体字段新增
|
6 years ago |
|
peter.pan
|
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 |
|
wei.peng
|
ee5a4f1dfe
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
0962b810ce
|
Json 转换精度丢失
|
6 years ago |
|
wei.peng
|
5d2695a5cb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
peter.pan
|
a551249165
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
2e5b7466c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
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 |
|
peter.pan
|
49d35f264e
|
Merge branch 'dev' into test
|
6 years ago |
于学杰
|
35f92b05e3
|
1. 修改ERP接口暂存表的字段，增加关联单据类型
|
6 years ago |
|
wei.peng
|
1ee9cb24f2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
2ce560b39f
|
生产报工明细实体修改和枚举新增
|
6 years ago |
jenkins
|
470d319504
|
Merge branch 'dev' into test
|
6 years ago |
sky.meng
|
3cc4aec00a
|
库存预警看板
|
6 years ago |
|
sky.meng
|
2f1a3080ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
05c56e46b4
|
库存预警看板开发
|
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 |
|
sky.meng
|
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 |
|
sky.meng
|
0f3d67d110
|
供应商收货看板功能完成
|
6 years ago |
|
许心洁
|
8347085f26
|
冲突
|
6 years ago |
|
许心洁
|
e3d5e5bb19
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
|
wei.peng
|
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 |
|
wei.peng
|
f32f7e72a2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
shiyanghuan
|
f3151cbbe3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
e13d4163b7
|
库存交易报表代码提交
|
6 years ago |
|
wei.peng
|
a4016dc911
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
刘敏
|
34dcf6d526
|
枚举修改
|
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 |
|
许心洁
|
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 |
jenkins
|
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 |
|
jenkins
|
32cc1db3bf
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
peter.pan
|
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 |
|
peter.pan
|
ea83820fbf
|
新增物料类型跟单位类型
|
6 years ago |
|
许心洁
|
b3272dc3d7
|
冲突
|
6 years ago |
|
许心洁
|
fe13a43ccc
|
WmsEnumUtil冲突（几步法）
|
6 years ago |
|
jenkins
|
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 |
|
jenkins
|
16bb8d6714
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
8e41b40196
|
excel工具类优化
|
6 years ago |
|
jenkins
|
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 |
|
jenkins
|
ac8b9d3986
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
b7a7eb29ae
|
安灯类型 查 表 已从表改为枚举
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
|
6 years ago |
|
jenkins
|
68fadff818
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |