jimmy
|
611fb5b601
|
修改有效性等等
|
7 years ago |
Silliter
|
3c32f511a7
|
单元测试开发工具类新增
|
7 years ago |
gragon.xu
|
e6775e65f6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
9189ca1bbd
|
前端调整
|
7 years ago |
jessica.chen
|
15f1df839b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
柯裕
|
c66edabb7f
|
修改查询条件
|
7 years ago |
|
jessica.chen
|
aa23a3973f
|
修改抽点记录信息和产品发运信息
|
7 years ago |
amy
|
90dda577fb
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
d4929181c7
|
删除标识枚举更改
|
7 years ago |
|
gragon.xu
|
7cd7712912
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
# modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java
|
7 years ago |
|
gragon.xu
|
766318f1dc
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
d4fa40ed79
|
controller&service合并
|
7 years ago |
|
jimmy
|
014a296bcd
|
移动抽点比例信息
|
7 years ago |
|
jessica.chen
|
92f58a0162
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
538ecf84c3
|
修改拼接
|
7 years ago |
|
gragon.xu
|
762d7d4cc0
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
db8e869674
|
测试
|
7 years ago |
|
jimmy
|
cf32b4c92a
|
修改PO订单明细表sql
|
7 years ago |
|
柯裕
|
5914c4e746
|
产品入库模块和作业任务模块
|
7 years ago |
|
jessica.chen
|
bf6c51b3aa
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
jessica.chen
|
6fe3f2a1ff
|
增加抽点记录信息
|
7 years ago |
|
amy
|
477f6c5ff1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
22d5ba1c0f
|
字段修改
|
7 years ago |
|
jessica.chen
|
8a55b01825
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
37008febab
|
查询条件添加
|
7 years ago |
|
jessica.chen
|
72407a5afc
|
更改产品发运信息
|
7 years ago |
|
gragon.xu
|
87048b4e42
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
73c5e20c01
|
移库单主表，移库单详情表
|
7 years ago |
|
jimmy
|
b9db3d0076
|
开发po订单主表、明细表
|
7 years ago |
|
jimmy
|
6fc6519382
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
92d74bee7b
|
开发po订单主表
|
7 years ago |
|
gragon.xu
|
d0b8f1649d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
41edf3f731
|
添加工厂代码作为查询条件；添加批量软删除方法
|
7 years ago |
|
amy
|
1ef429fc78
|
添加组织代码查询条件
|
7 years ago |
|
amy
|
ae61fad0d5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
0bacd88012
|
修改类名
|
7 years ago |
|
amy
|
1263460ced
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
amy
|
d0c6ec627c
|
查询条件添加
|
7 years ago |
|
jessica.chen
|
67f219a433
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
d2860e03fc
|
更改库存交易归档表信息和库存表信息
|
7 years ago |
|
jimmy
|
b2ad639060
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
6079c8e1a7
|
开发po订单主表
|
7 years ago |
alwaysfrin
|
dad173dfd0
|
1，对象hashcode和equals继承父对象
2，主键生成策略优化
|
7 years ago |
|
gragon.xu
|
375ba45b98
|
物料接口对接
|
7 years ago |
|
gragon.xu
|
fd767b349e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
6ebc052d76
|
pojo
|
7 years ago |
|
jimmy
|
d0db4acfba
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
5f0f6402a5
|
增加hql语句
|
7 years ago |
|
Silliter
|
e1f8878224
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
716ed00874
|
单元测试开发工具类新增
|
7 years ago |
|
amy
|
fee107d322
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
d73f134579
|
有效条件更改
|
7 years ago |
|
柯裕
|
7b54382c1a
|
添加查询条件
|
7 years ago |
|
amy
|
ce3e2eb75a
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
a1f496f8fb
|
实体数字类型默认值添加
|
7 years ago |
|
Silliter
|
021b4767cd
|
wms工厂仓库类书写
|
7 years ago |
|
gragon.xu
|
83c4347a8a
|
back
|
7 years ago |
|
gragon.xu
|
0df6504c56
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
gragon.xu
|
eb168e80f4
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
gragon.xu
|
de2325d2eb
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
amy
|
2108f314b1
|
有效条件更改
|
7 years ago |
|
gragon.xu
|
341a340ac8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
amy
|
6aad727b3d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java
|
7 years ago |
|
amy
|
aec47b10fa
|
供应商、作业类型基础数据
|
7 years ago |
|
gragon.xu
|
2b1bf288e1
|
Part
|
7 years ago |
|
jimmy
|
e0737797eb
|
开发抽点比例
|
7 years ago |
|
amy
|
0f7af655aa
|
wms查询条件添加
|
7 years ago |
|
Silliter
|
397f89f72e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
49422a3350
|
wms工厂仓库类书写
|
7 years ago |
|
gragon.xu
|
4937974f60
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
8d92834a2e
|
PartRepository
|
7 years ago |
|
Silliter
|
b8f0183d84
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
959291b6a9
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
9be6f3677d
|
wms工厂仓库类书写
|
7 years ago |
|
gragon.xu
|
3be0585879
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
gragon.xu
|
a626a6f91b
|
PartRepository
|
7 years ago |
|
gragon.xu
|
1d7aae1310
|
Part实体
|
7 years ago |
|
Silliter
|
b5abfb8eda
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
fc2258bbef
|
wms工厂仓库类书写
|
7 years ago |
|
柯裕
|
c7a030ee57
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
柯裕
|
d505020af2
|
存储区，客户，客户发往地模块
|
7 years ago |
|
jimmy
|
1d0373aa41
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
9137831312
|
开发库位、库位物料、交易类型
|
7 years ago |
|
Silliter
|
b5aea5adb9
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
c3db4b96bf
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
2c1736e3c7
|
wms工厂仓库类书写
|
7 years ago |
|
amy
|
8f2301825b
|
是否有效查询条件更改
|
7 years ago |
|
jimmy
|
83e351b50f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
21bc3a412b
|
开发基础数据
|
7 years ago |
|
Silliter
|
1dba722a42
|
wms工厂仓库类书写
|
7 years ago |
|
amy
|
ce597d3f2f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
46476549e4
|
修改库存交易规则
|
7 years ago |
|
amy
|
9b4ac2b7bf
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
11dcd6be3a
|
仓库
|
7 years ago |
|
jimmy
|
1b0a410108
|
修改库存交易规则
|
7 years ago |
|
jessica.chen
|
533fbc1390
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
9712f75d42
|
更改库存交易归档表信息和库存表信息
|
7 years ago |
|
jessica.chen
|
770fe0fa17
|
更改库存交易归档表信息和库存表信息
|
7 years ago |
|
jimmy
|
05c02ffd08
|
开发job库存交易规则
|
7 years ago |
|
Silliter
|
df8ad87dc4
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
09ea0aa259
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
faa4fb075e
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
c1ba26cbb4
|
wms工厂仓库类书写
|
7 years ago |
|
jessica.chen
|
072d64859c
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jessica.chen
|
3c646ff823
|
建立库存表实体类
|
7 years ago |
|
jimmy
|
43d8ad8fbc
|
修改库存交易规则
|
7 years ago |
|
柯裕
|
d63e51fab8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
柯裕
|
10520504f0
|
解决# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
Administrator
|
f24b0516e2
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
柯裕
|
80b41620b1
|
元数据按钮实体及数据库接口
|
7 years ago |
|
Administrator
|
db09851a59
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
Administrator
|
af2228a7b9
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
7 years ago |
|
jimmy
|
d7bf68d5ca
|
库存交易规则
|
7 years ago |
|
Administrator
|
f7e750e3cb
|
wms通用数据信息与字段实体增删改查
|
7 years ago |
|
jimmy
|
da9b042cf0
|
修改库存交易规则
|
7 years ago |
|
jimmy
|
26f30ec92b
|
修改库存交易规则
|
7 years ago |
|
jimmy
|
468ab162a5
|
修改库存交易规则
|
7 years ago |
|
jimmy
|
e36c33969f
|
开发库存交易规则
|
7 years ago |
|
Administrator
|
cc497e8a02
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Administrator
|
7479104bb9
|
接口驱动类
|
7 years ago |
|
jimmy
|
e95c145bc5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
c398e5f11c
|
开发交易规则
|
7 years ago |
|
Administrator
|
b8f3332887
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Administrator
|
4cf396419d
|
通用接口模块开发
|
7 years ago |
|
Silliter
|
cdfa9f9822
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
433ac603fc
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
e7f77d19c9
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
3f6da227e1
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
96fcb8ab4e
|
wms工厂仓库类书写
|
7 years ago |
wei.peng
|
724dd48cc1
|
删除target 文件夹 或者删除.iml 文件
|
7 years ago |
|
alwaysfrin
|
00f95dda13
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class
|
7 years ago |
|
alwaysfrin
|
883c31288b
|
ignore整理
|
7 years ago |
|
wei.peng
|
cdb48374ac
|
移除iml文件的版本控制
|
7 years ago |
|
wei.peng
|
9121cafcff
|
移除iml文件的版本控制
|
7 years ago |
|
alwaysfrin
|
231efdcf13
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
daf65deb32
|
国家化封装
|
7 years ago |
|
wei.peng
|
aaa0a1b21b
|
初始化系统配置
|
7 years ago |
|
alwaysfrin
|
a208e592bd
|
基础对象初始化
|
7 years ago |