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
|
f75a861d05
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
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
|
884d4fd763
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
77e2d1e3ec
|
物料表字段新增
|
6 years ago |
|
jenkins
|
fd7abde050
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Chnx
|
f12e480ff7
|
po订单表添加箱数字段
|
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 |
|
于学杰
|
9b6e8bf921
|
1. 修改拼错的单词
|
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 |
|
许心洁
|
052652dd36
|
交易处理组件（收货）：物料查询没有加工厂+流程设计：步骤调用参数值可以为空+作业处理组件：未修改不需要唯一校验
|
6 years ago |
|
许心洁
|
4261207e54
|
交易处理组件（收货）：物料查询没有加工厂+流程设计：步骤调用参数值可以为空+作业处理组件：未修改不需要唯一校验
|
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 |
wei.peng
|
9c201c70e8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
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 |
|
于学杰
|
4a7081f90b
|
1. 添加 SAP 中间数据库转换接口的 POJO 类
|
6 years ago |
汪云昊
|
c07858d5ba
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
4fef723bdb
|
增加移库单主表字段
|
6 years ago |
|
jenkins
|
28ae6cf85d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
曾贞一
|
25187ecf2c
|
存储区树型查询接口开发
|
6 years ago |
|
曾贞一
|
65beb8549f
|
wms存储区添加字段 是否子节点IS_SON_NODE
|
6 years ago |
Silliter
|
9170083b17
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
93fa0d1aaa
|
实体字段与pdm比对添加
|
6 years ago |
|
allen.zhang
|
d70f85d592
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
e33c7c2465
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9d9f5a2cc2
|
抽点记录查询条件增加
|
6 years ago |
|
刘敏
|
0b186e1317
|
物流路线查询修改
|
6 years ago |
|
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
刘敏
|
ca0a671e92
|
#4337
|
6 years ago |
|
wei.peng
|
019505c4d2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
37dc68b858
|
修改hql语句
|
6 years ago |
|
陈思洁
|
f6acf45ace
|
实体中增加乐观锁字段
|
6 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
76e553234e
|
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
|
6 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
93ace83b5f
|
长文本数据类型
|
6 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
cca408fcf0
|
监控台：防止出现负库存+流程配置：流程添加POSITION字段
|
6 years ago |
|
许心洁
|
c7e417e644
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
a65b3d6fb2
|
交易处理组件基础方法维护+流程配置+任务生成代码结构层优化+交易处理主程序查询移动单条件修改调工厂代码（代码逻辑错误）
|
6 years ago |
|
jenkins
|
298a3c1ddf
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
曾贞一
|
81821c70a8
|
移库单 生成条码问题
|
6 years ago |
|
许心洁
|
37efbf718e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
4cf5fbc2b7
|
#4091+流程配置复制流程+作业步骤参数，作业组件，作业组件参数，作业流程基础数据接口代码调整
|
6 years ago |
|
Silliter
|
5ffc366dd0
|
Merge branch 'dev' into test
|
6 years ago |
|
Silliter
|
10844622a7
|
1.优化查询语句
2.流程管家查询条件加上工厂字段
|
6 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
6 years ago |
|
许心洁
|
58c29f5aee
|
作业流程接口+作业组件接口联调优化
|
6 years ago |
|
Silliter
|
4e9a8ab787
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
24d115be6d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
35690ce138
|
作业流程界面+后端分页查询接口
|
6 years ago |
|
Silliter
|
0a36f9130f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
jimmy
|
bc1b0b7e90
|
业务类型表 字段数据类型修改
|
6 years ago |
|
Silliter
|
7e58ced783
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
fc15efe67c
|
开发业务类型增删改查接口
|
6 years ago |
|
Silliter
|
c99d7aec25
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
733b65e8d5
|
流程管家优化：1.缓存重新规划
2.重入保存上一步的回显
|
6 years ago |