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 |
|
peter.pan
|
67cd5e008b
|
主数据信息sql拼装
|
6 years ago |
|
jenkins
|
9232010d60
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
79d1da3230
|
系统数据初始化
|
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 |
|
jenkins
|
9848ca9c90
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
曾贞一
|
beb2285591
|
移库单业务逻辑修复 bug#4495
|
6 years ago |
|
曾贞一
|
ca625dbfcc
|
开发 交叉盘点业务，新建盘点范围表，盘点调差范围表
|
6 years ago |
|
于学杰
|
c3ff60a581
|
1. 解决 WMS 数据权限查询时多个值覆盖的问题
|
6 years ago |
|
jenkins
|
499edddace
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
5d034e2a8a
|
1. 增加缺失的 agdId 字段
|
6 years ago |
|
jenkins
|
f75a861d05
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
shiyanghuan
|
54d7190bf0
|
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 |
|
陈思洁
|
be8c20fc45
|
收货回执单据打印修改--ASN订单冗余标准包装字段
|
6 years ago |
|
shiyanghuan
|
1ad24c40f1
|
增加供应商物料信息
|
6 years ago |
|
陈思洁
|
821afdd75b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
fbfba84ab0
|
冗余业务字段数据
修改任务明细查询方法
|
6 years ago |
jiajack
|
27110b15a8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
9f56d34572
|
增加流程明细的ID字段
|
6 years ago |
|
jenkins
|
06892a9c99
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
b6b6ca8c1e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
1eda68e151
|
sap接口实体新增
|
6 years ago |
|
jenkins
|
3969a8c7f2
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
ec158d9bdf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
d3431028d7
|
StockQuan表新增ScrapQty字段：NC,盘点调差，出入移库交易处理组件+控制台逻辑变动
|
6 years ago |
|
于学杰
|
45cd34f067
|
1. SAP - WMS 接口 POJO 类中增加 groupName 属性
|
6 years ago |
|
于学杰
|
804fd91527
|
1. 完善 SAP - WMS 接口
|
6 years ago |
Chnx
|
a9f33764b2
|
po订单主表箱数默认0
|
6 years ago |
|
jenkins
|
e2556fa455
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
6546ae1562
|
要货计划实体新增
|
6 years ago |
|
jenkins
|
16bb8d6714
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
c3da8f58a0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
8e41b40196
|
excel工具类优化
|
6 years ago |
|
jenkins
|
884d4fd763
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
b1455ca960
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
77e2d1e3ec
|
物料表字段新增
|
6 years ago |
|
wei.peng
|
2efbd7b6b8
|
安灯
停机类型 增删改查询
事件原因 增删改查
呼叫原因 增删改查
|
6 years ago |
|
wei.peng
|
fa959bda63
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
215db96fa9
|
安灯 停机类型 功能接口完成
|
6 years ago |
|
汪云昊
|
ba5740f6b3
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
ad15137704
|
安灯 事件原因 功能接口完成
|
6 years ago |
|
汪云昊
|
21746dc440
|
excel工具类优化
|
6 years ago |
|
jenkins
|
fd7abde050
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Chnx
|
f12e480ff7
|
po订单表添加箱数字段
|
6 years ago |
|
汪云昊
|
163cb6240e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
dcef213da3
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
31c347275c
|
添加重要度枚举
|
6 years ago |
|
jenkins
|
ac8b9d3986
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
c90d70e54f
|
1. 完善 SAP - WMS 接口程序
|
6 years ago |
|
许心洁
|
29605d0c37
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5ef906d88f
|
交易处理组件去掉生成收货入库单逻辑+新增公共初始化组件+任务生成去掉调试邮件+作业步骤参数类型查询条件去掉工厂+交易类型对象去掉作业类型编号属性
|
6 years ago |
|
于学杰
|
cb2472bf97
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
9b6e8bf921
|
1. 修改拼错的单词
|
6 years ago |
|
wei.peng
|
c74ebe40f3
|
删除冗余代码
|
6 years ago |
|
wei.peng
|
1eccc09ab6
|
安灯类型 查 表 已从表改为枚举
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
|
6 years ago |
|
wei.peng
|
b7a7eb29ae
|
安灯类型 查 表 已从表改为枚举
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
|
6 years ago |
|
汪云昊
|
f50b157e0b
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
71060f26f3
|
事件信息维护
|
6 years ago |
|
于学杰
|
65ddc6f57a
|
1. 完善SAP WMS 接口
|
6 years ago |
|
jenkins
|
201d5cffee
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
曾贞一
|
ba23663011
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
db7b849f3e
|
添加 移库单主表字段
|
6 years ago |
|
于学杰
|
65efb44dde
|
1. 把默认值的类型改为 Object
|
6 years ago |
|
shiyanghuan
|
3c5dea23fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
37eb33bcad
|
线边库实体以及WmsHqlpack中添加sql封装
|
6 years ago |
|
陈思洁
|
6fb0abcadd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
cbb658e088
|
冗余字段新增
|
6 years ago |
|
jenkins
|
373bbfaa98
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
37aed24f33
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
052652dd36
|
交易处理组件（收货）：物料查询没有加工厂+流程设计：步骤调用参数值可以为空+作业处理组件：未修改不需要唯一校验
|
6 years ago |
|
许心洁
|
4261207e54
|
交易处理组件（收货）：物料查询没有加工厂+流程设计：步骤调用参数值可以为空+作业处理组件：未修改不需要唯一校验
|
6 years ago |
|
jenkins
|
68fadff818
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
2adff745fb
|
自定义表单 功能优化
|
6 years ago |
|
wei.peng
|
0fb7e05e88
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
alwaysfrin
|
d1f4f6b25b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
10c276fb16
|
自定义数据源
|
6 years ago |
|
jenkins
|
5fc6ac8006
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
b4e0effcb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
46a361a291
|
1. 增加 SAP - WMS 接口转换实体类
|
6 years ago |
|
jenkins
|
25fc477991
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
4cfe208bb7
|
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/bean/WmsProdCfgType.java
|
6 years ago |
|
刘敏
|
91442ec8ff
|
Wms V3新增实体创建
|
6 years ago |
|
许心洁
|
e9b1d7e595
|
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
|
6 years ago |
|
jenkins
|
511df468ec
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
13af329513
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
|
wei.peng
|
9c201c70e8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
yiming.gu
|
f349690cbb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
8a0ecfbaa9
|
新增mes查询条件
|
6 years ago |
|
汪云昊
|
8c4d74db52
|
解决冲突
细节优化
自定义表单功能管理 添加 是否设计字段
|
6 years ago |
|
陈思洁
|
767758f7a2
|
PO字段新增
|
6 years ago |
allen.zhang
|
919d633be0
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
854cb4e106
|
项目表新增，物料表中项目字段添加
|
6 years ago |
|
jenkins
|
a58888df85
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
0d63c10182
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
4a7081f90b
|
1. 添加 SAP 中间数据库转换接口的 POJO 类
|
6 years ago |