于学杰
|
6ba7a43ea7
|
Merge branch 'dev'
|
6 years ago |
|
于学杰
|
4350a82043
|
1. 完善脚本引擎
|
6 years ago |
|
于学杰
|
ca658628c8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# pom.xml
|
6 years ago |
刘敏
|
72ac1f39f4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d75570c987
|
库存报表问题修改
|
6 years ago |
|
于学杰
|
5dc8cd5bda
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
02044789dc
|
1. TO ERP 增加单据行号字段
2. 脚本引擎 & 规则引擎 增加工厂代码
|
6 years ago |
陈思洁
|
f26cdda8ec
|
实体新增字段
|
6 years ago |
Chnx
|
eb4914ae7a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Chnx
|
9c189dce3c
|
库存移动单查询接口
|
6 years ago |
peter.pan
|
24f7ae3471
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
53d34096f7
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
cf7957525a
|
盘点指令默认值赋值
|
6 years ago |
|
刘敏
|
6861d44a1c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
a1a77b63db
|
下线结算标识、是否录入生产批次。
POJO默认赋值2
|
6 years ago |
|
peter.pan
|
d9ef2677fb
|
Merge branch 'dev' into test
|
6 years ago |
shiyanghuan
|
b2866c85dd
|
bug修改
|
6 years ago |
|
peter.pan
|
f4613c2f5c
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
61ecc2a74f
|
Merge branch 'dev' into test
|
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 |
|
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
|
5741bfa2e6
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
5bed1d27ec
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
79b36a30a4
|
冲突合并
|
6 years ago |
|
陈思洁
|
fe3d392e9b
|
新增枚举信息
移库单明细表冗余主表临时字段
新增物料表字段
|
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
|
53135c27f5
|
Merge branch 'test'
|
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 |
|
peter.pan
|
1d9683b05f
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
36b2d36fdd
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
51753bb237
|
bug#4515
|
6 years ago |
|
peter.pan
|
eeefb843b4
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
37b8755485
|
Merge branch 'dev' into test
|
6 years ago |
|
shiyanghuan
|
073393a5b1
|
bug修改
|
6 years ago |
|
shiyanghuan
|
7dd78d1983
|
bug修改
|
6 years ago |
|
shiyanghuan
|
172fc81bee
|
bug修改
|
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
|
c02d22ecba
|
Merge branch 'test'
|
6 years ago |