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 |
|
刘敏
|
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 |
 曾贞一
|
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 |
|
刘敏
|
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 |
|
陈思洁
|
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 |
|
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 |
|
peter.pan
|
67cd5e008b
|
主数据信息sql拼装
|
6 years ago |
|
许心洁
|
79d1da3230
|
系统数据初始化
|
6 years ago |
|
peter.pan
|
7008d5c35e
|
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/repository/WmsProdCfgTypeRepository.java
|
6 years ago |
|
peter.pan
|
66a66f229b
|
主数据信息
|
6 years ago |
|
sky.meng
|
8409025253
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into stock_report
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
|
6 years ago |
|
sky.meng
|
a67f88a4bb
|
库存报表开发
|
6 years ago |
|
曾贞一
|
beb2285591
|
移库单业务逻辑修复 bug#4495
|
6 years ago |
|
曾贞一
|
ca625dbfcc
|
开发 交叉盘点业务，新建盘点范围表，盘点调差范围表
|
6 years ago |
于学杰
|
c3ff60a581
|
1. 解决 WMS 数据权限查询时多个值覆盖的问题
|
6 years ago |
|
于学杰
|
5d034e2a8a
|
1. 增加缺失的 agdId 字段
|
6 years ago |
wei.peng
|
a5b5150b44
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
0c1d1b3d97
|
添加FastDfs 配置
|
6 years ago |
|
shiyanghuan
|
b871b34dba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |