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 |
shiyanghuan
|
b330676d61
|
库存报表业务改动以及bug修改
|
6 years ago |
|
shiyanghuan
|
af278555d0
|
库存报表业务改动以及bug修改
|
6 years ago |
 曾贞一
|
019087fe48
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
曾贞一
|
71087e5d43
|
组织树 数据权限修复
|
6 years ago |
Chnx
|
0c841b645e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Chnx
|
8f182f962d
|
库存移动单查询接口
|
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 |
|
wei.peng
|
d7cb05e390
|
树DEMO 功能完成
|
6 years ago |
|
wei.peng
|
6cd229e286
|
本地无法启动,更新代码
|
6 years ago |
|
曾贞一
|
1f0bfd4554
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
cf96de8043
|
盘点 盘点差异结果同步ERP
|
6 years ago |
|
刘敏
|
8f5d952c4f
|
单位查询工厂添加
|
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 |
许心洁
|
e6d60f6886
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
dec3743911
|
流程管家推队列查询条件没有封装
|
6 years ago |
|
wei.peng
|
2cbc082c7b
|
动态对象 空数据处理
|
6 years ago |
|
peter.pan
|
36b2d36fdd
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
51753bb237
|
bug#4515
|
6 years ago |
|
peter.pan
|
32a563e053
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
dcb9b59ec9
|
新增一个实体封装
|
6 years ago |
|
peter.pan
|
37b8755485
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
37022efee8
|
合并代码
|
6 years ago |
|
wei.peng
|
78cfff1748
|
功能优化
|
6 years ago |
汪云昊
|
d3deaa6081
|
安灯bug解决
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
|
6 years ago |
|
shiyanghuan
|
073393a5b1
|
bug修改
|
6 years ago |
|
shiyanghuan
|
7dd78d1983
|
bug修改
|
6 years ago |
|
shiyanghuan
|
172fc81bee
|
bug修改
|
6 years ago |
|
wei.peng
|
9dc634d63e
|
用户查询功能优化
|
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 |
|
曾贞一
|
b684bd2355
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
81ed2465e3
|
盘点实盘信息 增加字段 是否范围内
|
6 years ago |
|
peter.pan
|
e95db40c23
|
123
|
6 years ago |
|
peter.pan
|
52addcf5ea
|
Merge branch 'dev' into test
|
6 years ago |
|
shiyanghuan
|
7ee861d61e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
2c28d6303f
|
bug修改
|
6 years ago |
|
peter.pan
|
543171dfbb
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
f853f06ceb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
97b60f0906
|
下线结算HQL的BUG
|
6 years ago |
jiajack
|
b34ddf5f64
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
681ca7eebe
|
修改取值为空时的问题
|
6 years ago |
|
wei.peng
|
1ac5542541
|
动态表单分页功能完成
|
6 years ago |
|
peter.pan
|
bd28a7ac63
|
Merge branch 'dev' into test
|
6 years ago |
|
peter.pan
|
1ee48f4ef8
|
xxx
|
6 years ago |
|
陈思洁
|
fede09a5eb
|
WMS_ERP库存移动表修改item的数据类型
|
6 years ago |
|
刘敏
|
7be287137a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
19b5764776
|
收货回执打印信息新增 供应商字段新增 出库条码规则校验修改
|
6 years ago |
|
jiajack
|
7b70f47c64
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
27ba751a09
|
修改iqc数据库默认值
|
6 years ago |
|
peter.pan
|
e3354f52bd
|
Merge branch 'dev' into test
|
6 years ago |
|
shiyanghuan
|
52b9e09835
|
条码打印-条码模糊查询
|
6 years ago |
|
陈思洁
|
92daec97e3
|
枚举修改名字
|
6 years ago |
|
许心洁
|
47d8360a3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
9b9f94f059
|
盘点调差暂时处理
|
6 years ago |
|
peter.pan
|
b8730fac47
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
ac5bf14d6b
|
动态表单动态操作 功能优化
|
6 years ago |
|
许心洁
|
ebf517cb3d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
81eb13bafd
|
写入SAP单据锁定表
|
6 years ago |
|
许心洁
|
15386ae5c2
|
枚举
|
6 years ago |
|
peter.pan
|
628f1db31c
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
842f322188
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
529617a8b7
|
优化
|
6 years ago |
|
汪云昊
|
ff9a5dcd17
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
4fe3701929
|
还原
|
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 |
|
shiyanghuan
|
cef6d9c3ad
|
bug修改
|
6 years ago |
|
shiyanghuan
|
da5d5d1af0
|
客户编号-模糊查询
|
6 years ago |
|
peter.pan
|
9c38ed702a
|
Merge branch 'dev' into test
|
6 years ago |
|
shiyanghuan
|
e00a0a9d9d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
c2609be241
|
作业类型分页查询 模糊查询
|
6 years ago |
|
刘敏
|
97adebba21
|
枚举新增 实体字段新增
|
6 years ago |
|
刘敏
|
eefaf55f24
|
供应商字段类型修改
|
6 years ago |
|
刘敏
|
7fc7fab54c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
493fbb83d9
|
条码查询条件
|
6 years ago |
|
peter.pan
|
3b1d19bbab
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
a7fbc9e58f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
b5ff789263
|
开发 wms推送AMP库存数据
|
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 |
|
刘敏
|
16301be9dc
|
JOB开发实体新增
|
6 years ago |
|
刘敏
|
1b569ff3a8
|
ERP同步标识枚举添加
|
6 years ago |
|
刘敏
|
3090b2aaad
|
实体缺失字段新增
|
6 years ago |
|
刘敏
|
8cbc19eb37
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
da12d8f6b0
|
错误信息字段冗余
|
6 years ago |
|
许心洁
|
c7aca0a94d
|
交易处理主程序转换数据错误+出入移库查找添加条件
|
6 years ago |
|
wei.peng
|
ee5a4f1dfe
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
703dc6851c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
f85a0296ae
|
开发 bom拆解功能
|
6 years ago |
于学杰
|
dd2408cd4a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
72ef115db8
|
1. 批次字段不允许为空
|
6 years ago |
|
wei.peng
|
d1cbfa27e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
0962b810ce
|
Json 转换精度丢失
|
6 years ago |
|
刘敏
|
0a69cddb53
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
b98b48e4e5
|
SAP_产品报工汇总表新增
|
6 years ago |
|
陈思洁
|
ede4458709
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
6f41158ecb
|
生产发运新增实体属性
|
6 years ago |
|
wei.peng
|
5d2695a5cb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
08af5fde04
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
a551249165
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
30bed57c04
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
7e9a7698a0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
2eba4bb745
|
文件上传接口
excel通用导出优化
|
6 years ago |
|
于学杰
|
bc6d7f5c4d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
e7bd528736
|
1. 设置 is_sync 字段不允许为空，默认值为 2
|
6 years ago |
|
wei.peng
|
2e5b7466c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
d9d776060f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
557880ffd2
|
生产报工明细实体修改
|
6 years ago |
|
wei.peng
|
1b4e5143aa
|
用户单帐号多平台登录
|
6 years ago |
|
shiyanghuan
|
b29d5722bc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
31b7e2d8dc
|
库存交易报表和未完成订单报表bug修复
|
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 |
|
刘敏
|
787eaaf53d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1ee9cb24f2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
于学杰
|
2b1414814c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
baeb202ca5
|
1. 增加查询系统配置参数的结构
|
6 years ago |
|
陈思洁
|
1b1f2aca51
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
2ce560b39f
|
生产报工明细实体修改和枚举新增
|
6 years ago |
|
wei.peng
|
03ec13ca5c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
299c0c5bee
|
DataObject Key 动态获取
|
6 years ago |
|
汪云昊
|
0656fa6078
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
a7bfc692fe
|
EXCEL数据通用导出
|
6 years ago |
|
刘敏
|
7ac3509f96
|
状态查询添加是否有效
|
6 years ago |
|
shiyanghuan
|
400b380b55
|
未完成订单查询报表代码提交
|
6 years ago |
jenkins
|
470d319504
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
4a4a50638c
|
生产报工明细实体提交
|
6 years ago |
|
刘敏
|
98229202b8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d91c9138b3
|
字段新增
|
6 years ago |
|
汪云昊
|
ee440bc487
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
sky.meng
|
3cc4aec00a
|
库存预警看板
|
6 years ago |
|
汪云昊
|
6c7bd177ca
|
文件上传微服务接口优化
excel通用导出优化
任务提示优化
|
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 |
|
刘敏
|
d7f15cddef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
ae4e31e22c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
484c5942e8
|
所有业务单据Item属性都用String类型
|
6 years ago |
|
刘敏
|
eb7ff3fd40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
4b924c64a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
peter.pan
|
af7e8d7a43
|
组织码
|
6 years ago |
|
刘敏
|
e42c238d16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7c28110bd4
|
代码忘了发起合并请求
|
6 years ago |
|
刘敏
|
cd566574cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
713503d7ff
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
91f1a120a2
|
1. 修改编译不过的代码
|
6 years ago |
|
于学杰
|
5d1447c92a
|
1. 解决标准拣货多级存储区查找的问题
|
6 years ago |
|
peter.pan
|
ced56de9de
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
b1ca55e3a3
|
pojo
|
6 years ago |
|
许心洁
|
41324abdad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b13a9cd79c
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
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 |
|
许心洁
|
8ba2173753
|
冲突
|
6 years ago |
|
许心洁
|
8347085f26
|
冲突
|
6 years ago |
|
刘敏
|
48589a10cb
|
默认字段修改
|
6 years ago |
|
许心洁
|
e3d5e5bb19
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
|
刘敏
|
945ef82867
|
实体字段新增
|
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 |
|
汪云昊
|
5bc455798b
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
4309454d2a
|
邮件异常提示优化
EXCEL数据通用导出
|
6 years ago |
|
陈思洁
|
d0d9a467a3
|
乐观锁修改数字类型
|
6 years ago |
|
wei.peng
|
edc0dda102
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
62ae657151
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
71f6d48d16
|
修改流程管家实体--架构
|
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
|
f1c49c1cae
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
4d37e2a095
|
合并
|
6 years ago |
|
wei.peng
|
9cc7c5d8b8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
2f595807ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
14a8afca83
|
优化 盘点代码
|
6 years ago |
|
刘敏
|
cabb4c9357
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
1a43546bd1
|
条码状态报表开发
|
6 years ago |
alwaysfrin
|
4ce22aaa3f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
d4dce36280
|
流程管家优化
|
6 years ago |
|
jenkins
|
e4cf82841f
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
663d8cdcf1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
aed953a03e
|
1. FIFO 推荐时要加上 sn_status = 40 的筛选条件
|
6 years ago |
|
刘敏
|
6aaf2f3f3e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
1f403ebe40
|
代码优化
|
6 years ago |
|
jenkins
|
c12cdea29f
|
Merge branch 'dev' into test
|
6 years ago |
|
peter.pan
|
96e031b2f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
062b20af23
|
物料清单dao层
|
6 years ago |
|
刘敏
|
8d8c91f352
|
盘点调差导入接口表开发
|
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 |
|
曾贞一
|
022d178833
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
e8c736ee67
|
开发 交叉盘点 库存容量更新
|
6 years ago |
|
曾贞一
|
316050dd24
|
开发 交叉盘点 库存容量更新
|
6 years ago |
|
刘敏
|
98cf305653
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
6ee8d7d2a2
|
1. 修改潜在BUG
|
6 years ago |
|
刘敏
|
7488f0652e
|
移库单明细查询条件新增、盘点导入开发
|
6 years ago |
|
刘敏
|
34dcf6d526
|
枚举修改
|
6 years ago |
|
wei.peng
|
3605e5ef35
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
于学杰
|
9282edf93a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
c6f5111510
|
1. 解决标准拣货中的 FIFO 按照存储区推荐问题
|
6 years ago |
|
汪云昊
|
6c68b123f0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
a8a1c2fe8b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
659968da3c
|
流程管家启动加载流程不存在不报错+MOVE_NO存KEY的BUG
|
6 years ago |
|
汪云昊
|
f3ba4b33a2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
5f74c26466
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
326992e6ce
|
通过库存地查询存储区的sql新增
|
6 years ago |
|
刘敏
|
60be1763b2
|
实体数字类型get方法重写
|
6 years ago |
|
汪云昊
|
5d6f9a42af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
b815564e6e
|
线边配料页面新增任务字段、主表状态字段
|
6 years ago |
|
汪云昊
|
90028caa6f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
sky.meng
|
78c8d3b689
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
9d2146b23d
|
客户零件号功能完成
|
6 years ago |
jenkins
|
0b302482fd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
5b6068b2ae
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
60d151eb35
|
1. 完成 WMS --> SAP 接口程序
|
6 years ago |
|
jenkins
|
8132c94cee
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
c6b24ea3cc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
8c4646bc41
|
实体类型修改
|
6 years ago |
|
shiyanghuan
|
f6bc967e07
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
bcd3e43867
|
库存交易报表部分代码提交以及供应商物料bug修复
|
6 years ago |
|
陈思洁
|
b6ae6c64ed
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
add3f05985
|
数据权限hql修改
|
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 |
|
陈思洁
|
5f5bd84089
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
8e8cafc6d8
|
数据权限增加角色名称
库存条码数量封装
|
6 years ago |
|
刘敏
|
9b2356231e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
4a5f799291
|
实体新增
|
6 years ago |
|
刘敏
|
8a420ff9c9
|
库存转储指令 供应商退货指令实体新增
|
6 years ago |
|
汪云昊
|
f4fe91ace0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
6259bd56bc
|
通用EXCEl导出MODEL
|
6 years ago |
|
sky.meng
|
15c22e28fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
0182dd3cc3
|
生产线(工作中心) 存储区关系管理功能完成
|
6 years ago |
|
shiyanghuan
|
f7f0ebadaf
|
Merge branch 'dev' of http://git.estsh.com/i3-WMS/i3plus-wms into dev
# Conflicts:
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsUnitController.java
|
6 years ago |
|
刘敏
|
81f0ea48ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
5694d58256
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
02734d33f9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
b6746b7e6f
|
1. 增加 WMS 到 SAP 接口的处理代码
|
6 years ago |
|
刘敏
|
0a7583a91b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
85681c4465
|
导入问题统一修改
|
6 years ago |
|
陈思洁
|
0210ab9d70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
16ceb8ff7b
|
修复任务权限业务逻辑
|
6 years ago |
|
曾贞一
|
8f56fc5620
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
fa59716c17
|
需求变更 冻结盘点业务
|
6 years ago |
|
jenkins
|
4212c9b61e
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
shiyanghuan
|
6222923c80
|
修改
|
6 years ago |
|
刘敏
|
3310571d18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
856345e830
|
初始化问题修改
|
6 years ago |
|
许心洁
|
c4bdbc3c17
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7fa871508e
|
流程修改去掉工厂代码+库存交易实体新增scrapQty字段
|
6 years ago |
|
wei.peng
|
1be5aa02bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
刘敏
|
8dc939b849
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
07e6e58e23
|
实体新增与修改
|
6 years ago |
|
陈思洁
|
e85c2ea992
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
91999948b6
|
sql优化
|
6 years ago |
|
刘敏
|
e726833580
|
非JIS发运实体新增
|
6 years ago |
|
许心洁
|
ada53de0fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
f69795cc5f
|
任务数据来源基础数据维护唯一校验修改
|
6 years ago |
|
sky.meng
|
baee01a070
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
5f898661c7
|
添加产线(工作中心)-存储区信息 repository
|
6 years ago |
|
wei.peng
|
a02b32a20e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
8d64152e58
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
6 years ago |
|
曾贞一
|
8289de8259
|
优化 新建盘点范围数据
需求更新 盘点冻结业务
|
6 years ago |
|
shiyanghuan
|
619487aedb
|
修改库位物料和供应商物料bug
|
6 years ago |
|
shiyanghuan
|
f7d4f85d45
|
库位物料和供应商物料bug修复
|
6 years ago |
|
jenkins
|
320910e2ae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
721ddbee3c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
16400aa31c
|
实体字段修改
|
6 years ago |
|
sky.meng
|
e5e0da62e7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
939d67e7f3
|
添加产线信息管理(工作中心)
|
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 |
|
陈思洁
|
f89a98479c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
30dd11cce7
|
sql拼接优化
|
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 |
|
shiyanghuan
|
2be5f29a63
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
40f0860647
|
修改库位物料和供应商物料bug
|
6 years ago |
|
shiyanghuan
|
4fad1795b1
|
修改库位物料和供应商物料bug
|
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 |
|
刘敏
|
3bb095a8ab
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
7d0cd674cf
|
零星退料指令导入开发
|
6 years ago |