wei.peng
|
b562d94c0d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1e797d0dac
|
级联功能接口完成(未测试)
|
6 years ago |
yunhao.wang
|
20a502f3bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
9beafd1bc6
|
自定义表单 功能权限管理接口
微服调整 平台角色获取方法调整
|
6 years ago |
yihang.lv
|
da3490acbf
|
sweb repository init 9 files
|
6 years ago |
Silliter
|
ab93f7b3de
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yihang.lv
|
acc8e97825
|
sweb bean init 9 files
|
6 years ago |
|
Silliter
|
fe644066af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
amy
|
126f47ae33
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
1b97e377f2
|
pojo引入jar包
|
6 years ago |
|
amy
|
6fb971cd60
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
9b8ebb5628
|
实体数量处理
|
6 years ago |
gragon.xu
|
4ea0448f8c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
0e9315cd89
|
作业任务生成事务控制
|
6 years ago |
alwaysfrin
|
244494d77b
|
hql封装优化
|
6 years ago |
|
wei.peng
|
d3331e4e12
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
04ed151d45
|
元素管理接口完成(未测试)
|
6 years ago |
|
yunhao.wang
|
dc9fbb2919
|
添加拦截器接口
|
6 years ago |
|
Silliter
|
38311760a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
Rock.Yu
|
c38a62955d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Rock.Yu
|
bd4df83519
|
1. 增加脚本引用 POJO
|
6 years ago |
jimmy
|
cd00bdd954
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
3c2a345b93
|
盘点pc端
|
6 years ago |
|
wei.peng
|
93f4745afd
|
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
# pom.xml
|
6 years ago |
|
yunhao.wang
|
513fa332c8
|
测试
|
6 years ago |
柯裕
|
9477ba5c91
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
1bd875d264
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
6efb49aca5
|
表单功能接口优化
表单布局接口优化
表单菜单接口优化
|
6 years ago |
|
柯裕
|
26b4f3e5b4
|
调整微服务入参
|
6 years ago |
|
alwaysfrin
|
ffeaf1e25c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
8fb36134a6
|
shiro会话id优化，自动update赋值优化
|
6 years ago |
|
Silliter
|
5a557495af
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
84c07f3db0
|
优化单据打印业务
|
6 years ago |
|
gragon.xu
|
dd31efa945
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
9a185abed1
|
调用获取单号不需要SID+盘点实体添加是否散件字段
|
6 years ago |
|
wei.peng
|
7190c8ff6f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
045c68ee2e
|
数据对象管理接口开发完成
|
6 years ago |
|
柯裕
|
3d8b3983c3
|
优化枚举
|
6 years ago |
|
yunhao.wang
|
c2e01000e5
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
5a7e6c318a
|
定时任务优化
表单布局优化
|
6 years ago |
|
柯裕
|
1f50fecf80
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
0211390c44
|
PO明细实体状态数据类型更新为Integer;
PO明细查询封装hql单据编号匹配改为equal
|
6 years ago |
|
gragon.xu
|
ff4c50c5f1
|
枚举统一
|
6 years ago |
|
gragon.xu
|
0ed4691114
|
枚举统一
|
6 years ago |
|
gragon.xu
|
8b3b37260e
|
枚举统一
|
6 years ago |
|
gragon.xu
|
2987e34dc7
|
ASN,PO明细表，产品入库表的ERPWHNO改成ERPAREANO
|
6 years ago |
|
Silliter
|
0ad159581c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
e09d96a925
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
b2544dcb43
|
盘点调差开发
|
6 years ago |
|
amy
|
69cef0bf3a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
ecde67e47e
|
修改
|
6 years ago |
|
Silliter
|
e8de83b696
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
287a9b3892
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
9a7c26338a
|
订单打印，流程管家优化
|
6 years ago |
|
柯裕
|
e2a6619dcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
130343ea6b
|
PO明细实体更新
|
6 years ago |
|
yihang.lv
|
ec34456b6f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
b41e06f412
|
wmsPOMasterDetails erpWhNo---》 erpAeraNo
|
6 years ago |
|
Silliter
|
afa2ac746a
|
定时获取库存移动信息开发
|
6 years ago |
|
yunhao.wang
|
0171439464
|
版本发布 2019年3月26日22:47:53
|
6 years ago |
|
Silliter
|
dbeb965e9b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
fea99120ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
4be69f77c0
|
开发单据打印
|
6 years ago |
|
柯裕
|
913dcae75f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
85493e4f88
|
散件收货查询
|
6 years ago |
|
wei.peng
|
679a9107f5
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
e4adb35413
|
自定义表单 数据对象 新增接口完成
|
6 years ago |
|
gragon.xu
|
2ce0dcbaf1
|
dragon
|
6 years ago |
|
wei.peng
|
e4a3b95f16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1049a11576
|
自定义表单 数据对象 新增接口完成
|
6 years ago |
jessica.chen
|
c500681b5d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jessica.chen
|
00ee87f645
|
新增NC处理的操作类型枚举
|
6 years ago |
|
amy
|
1560a9b73d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
fb819c27b2
|
实体字段添加
|
6 years ago |
|
yihang.lv
|
39ddab4cf9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
e4bbd3a1a1
|
物料表 添加 是否条码管理
|
6 years ago |
|
amy
|
ce9ad43cd8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
e4a271cd4f
|
庫位物料新增是否生成領料單字段
|
6 years ago |
|
gragon.xu
|
2a38dc0b0c
|
库位的零件数量为Double类型
|
6 years ago |
|
jimmy
|
2192ecdb18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
871fae62ec
|
重写库位get方法
|
6 years ago |
|
Silliter
|
d67cdc6900
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
Silliter
|
ec50aef781
|
开发单据打印
|
6 years ago |
|
yunhao.wang
|
8850f28cd1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
fc44c4919f
|
定时任务计划添加参数
|
6 years ago |
|
jimmy
|
94f588cfdb
|
盘点PAD组件
|
6 years ago |
|
wei.peng
|
f039095f83
|
数据对象实体更新
创建数据对象 Model
|
6 years ago |
|
柯裕
|
b65f6197c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
2e578200d8
|
质检主表添加是否散件字段
|
6 years ago |
|
Silliter
|
3e9a40a47a
|
开发提交按钮控制
|
6 years ago |
|
gragon.xu
|
a8f3307237
|
定时任务循环记录异常
|
6 years ago |
|
Silliter
|
b99c28e1b1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
a889e00cba
|
优化任务列表
|
6 years ago |
|
amy
|
cd3ef63c90
|
po是否散件字段添加
|
6 years ago |
|
amy
|
4dd8bd3b5c
|
移库单字段新增
|
6 years ago |
|
Silliter
|
2d6e3b5545
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
7f55f210b6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
8ef0e787b9
|
交易反向处理
|
6 years ago |
|
yunhao.wang
|
287b076dee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
635cc27eb0
|
自定义表单布局接口
自定义表单菜单接口
自定义表单功能接口
|
6 years ago |
|
Silliter
|
6d8a8f4bb9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
d14e0a5cb2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
046ece7221
|
流程管家优化
|
6 years ago |
|
yihang.lv
|
2cf97f8ed1
|
移库单订单条码表 分页查询 条件去掉 partNameRdd
|
6 years ago |
|
yihang.lv
|
f9a820dae4
|
bean 所有QTY数量默认为0修改
|
6 years ago |
|
yihang.lv
|
1176053fe9
|
移库单条码表增删改查
|
6 years ago |
|
Silliter
|
2292738c7d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jessica.chen
|
e4aa1cfbc3
|
库存移动明细数据实体
|
6 years ago |
|
yunhao.wang
|
aa98d8dc14
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
fbc72a4f11
|
表单报表部分功能
定时任务优化
|
6 years ago |
|
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
1f4a00f39e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
01dc635d38
|
开发流程管家
|
6 years ago |
|
alwaysfrin
|
e10d71919a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
6f8f13c552
|
根据类型查询库位分页
|
6 years ago |
|
alwaysfrin
|
1897d227e6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
ea2eb6103d
|
优化调整
|
6 years ago |
|
Silliter
|
dd0af51d8f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
ee174c5489
|
实体优化
|
6 years ago |
|
Silliter
|
4aaa9bc03a
|
1.优化流程管家
2.开发条码打印，订单打印，收货回执打印
|
6 years ago |
|
yunhao.wang
|
2ba8b1498b
|
字典微服务调整
定时任务优化
自定义表单实体
|
6 years ago |
|
wei.peng
|
bfd99830b6
|
FindBugs 提示Bug 修改
|
6 years ago |
|
wei.peng
|
0d8c69a9c6
|
自定义表单 初始化
|
6 years ago |
|
wei.peng
|
1197412359
|
自定义表单 初始化
|
6 years ago |
|
gragon.xu
|
3be87f2882
|
作业任务表：“是否配料”->“是否一步法操作”
|
6 years ago |
|
gragon.xu
|
6b9823cd64
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
18fc77b99c
|
反向交易处理程序+作业任务新增“是否一步法”字段
|
6 years ago |
|
Silliter
|
5f76a14276
|
优化条码打印功能
|
6 years ago |
|
yunhao.wang
|
e50ebc310f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
5f746792c5
|
字典微服务调整
定时任务优化
|
6 years ago |
|
Silliter
|
6396056d08
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
498fbea67b
|
定时任务微服优化
|
6 years ago |
|
alwaysfrin
|
3ec56056d3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
1dcdf36537
|
添加mes、mes-pcn、sweb三个微服
|
6 years ago |
|
wei.peng
|
01ee15e67a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
569e872ebc
|
自定义表单枚举添加
|
6 years ago |
|
gragon.xu
|
ca8b9462b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
970fa83557
|
dragon
|
6 years ago |
Jack.lv
|
b9d00d181e
|
条码枚举
|
6 years ago |
|
Silliter
|
d19d57979f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
75e622763c
|
解决冲突
|
6 years ago |
|
Silliter
|
234aad93e3
|
1.优化流程管家
2.任务列表查询加入任务状态字段
|
6 years ago |
|
gragon.xu
|
c9215a7079
|
任务明细没有工厂；任务合并hql语法错误
|
6 years ago |
|
Silliter
|
b1f195a185
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
557f21bf6a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
bd6f6c0546
|
交易处理组件V2.0：库存交易表中数量类属性与库存表保持一致
|
6 years ago |
|
Jack.lv
|
09264b8f4b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Jack.lv
|
73d2da12ed
|
po版本枚举
|
6 years ago |
|
jimmy
|
4e8ab00fed
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
6cf53459e2
|
修改代码
|
6 years ago |