Silliter
|
b0cb1b795b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
gragon.xu
|
6b25e77793
|
监控台模拟数据+不同库存数量接口修改
|
6 years ago |
|
Silliter
|
28e43c087b
|
合并dev分支代码
|
6 years ago |
|
Silliter
|
7f36c485ab
|
盘点实盘
|
6 years ago |
|
gragon.xu
|
ae8f051f53
|
单号生成
|
6 years ago |
|
Silliter
|
6cb456fcc4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
72691f50ed
|
散件收货移动单明细推入队列错误；
库位物料字段维护；
|
6 years ago |
|
Silliter
|
0181b0ecab
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
b17d65356a
|
盘点主表新增get方法
|
6 years ago |
|
Silliter
|
f509514233
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
d9a523473d
|
PO散件单据不可以生成条码+任务生成随机单号加上“RANDOM”标志
|
6 years ago |
Rock.Yu
|
ec7fbd6b72
|
1. 增加了无状态的会话
|
6 years ago |
|
Silliter
|
ac52608e22
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Rock.Yu
|
bc9eb6c673
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Rock.Yu
|
9fabcbc85d
|
1. 业务规则中用到的对象必须加到 POJO 里
|
6 years ago |
|
Silliter
|
7343d25e19
|
流程管家优化
任务列表优化
|
6 years ago |
yunhao.wang
|
9c54bc6f9d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Rock.Yu
|
a85cc69e14
|
1. 修复 Object 加载有问题的 BUG
|
6 years ago |
|
Silliter
|
2fd68ec15e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
a13d87c246
|
优化任务列表和流程管家
|
6 years ago |
|
Silliter
|
df714efc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
d9b1be4622
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
5d52910960
|
移库单主表的“是否校验条码”字段去掉
|
6 years ago |
amy
|
67e0d7a443
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
amy
|
fc6368ca5f
|
查询条件封装修改
|
6 years ago |
|
gragon.xu
|
13106615ee
|
PO明细标准包装改为Double
|
6 years ago |
|
Silliter
|
d885d6b877
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
b8e9d9c1d4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
jessica.chen
|
43ad2e35c9
|
代码错误--刘敏
|
6 years ago |
|
Rock.Yu
|
2aa692a9c0
|
1. 增加无参数的构造函数
|
6 years ago |
柯裕
|
0c73ad7072
|
移库明细新增临时字段
|
6 years ago |
|
gragon.xu
|
6e4d59cf7f
|
根据PO单号批量生成条码
|
6 years ago |
|
Silliter
|
28a962d9d4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
47424307f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
4b5fc9d394
|
根据PO单号批量生成条码
|
6 years ago |
|
Silliter
|
0f637fe2f7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
amy
|
03b28b5682
|
数字型字段get方法重写
|
6 years ago |
|
Rock.Yu
|
e58b28ecc4
|
1. 完善规则引擎，增加了规则存储在数据库的功能
2. 修改脚本引擎 repository 命名
|
6 years ago |
|
gragon.xu
|
6dccfc8fa8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
404ad6bad8
|
交易处理组件生成移库单新增属性“是否指定条码”默认为是
|
6 years ago |
jimmy
|
9dca4f2dbb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
eda257bf23
|
盘点PDA端，输入数量校验
|
6 years ago |
|
Silliter
|
7e73059944
|
合并dev分支代码
|
6 years ago |
|
Silliter
|
0f7695eab3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
85210d4ca1
|
优化流程管家
|
6 years ago |
|
Silliter
|
4c0116b082
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
amy
|
b0e4f719e2
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
amy
|
53628e89d7
|
代码规范修改
|
6 years ago |
|
Silliter
|
a4bc8ec6ca
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jessica.chen
|
3390a89b29
|
修改基础数据备注字段
|
6 years ago |
|
amy
|
fc80e34b14
|
代码规范修改
|
6 years ago |
|
Silliter
|
f39a9d14da
|
合并dev分支代码
|
6 years ago |
|
Silliter
|
b36ba9c34f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
4f31301ea1
|
流程管家收货业务优化
|
6 years ago |
|
gragon.xu
|
a3f258dd1d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
7020b1a534
|
前端：库存交易记录添加移动单号作为查询条件；
后端：添加常量TASK_JOB,TRANS_AM + 库存交易记录添加移动单号作为查询条件 + 修改任务生成component属性命名 + 修改获取冻结数量HQL + 交易反向处理：交易过期提示，数量比较要用.doubleValue
|
6 years ago |
|
Silliter
|
ba3a542934
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
8684d95c1e
|
优化代码
|
6 years ago |
|
jessica.chen
|
8a396061b5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jessica.chen
|
73d1378f0d
|
修改移库单条码的sql查询语句
|
6 years ago |
jiajack
|
3a5f43f97b
|
删除iml文件
|
6 years ago |
|
Silliter
|
5a59437437
|
优化代码
|
6 years ago |
|
amy
|
71279f2241
|
查询条件新增
|
6 years ago |
|
Silliter
|
85b8aeb89b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
yihang.lv
|
6e8e425f1e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
4a97182c45
|
供应商登录微服务
|
6 years ago |
|
amy
|
17d9927b1a
|
代码优化
|
6 years ago |
|
Silliter
|
c8aa6ec786
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
86125cff37
|
盘点pc端
|
6 years ago |
|
jimmy
|
15542b7205
|
盘点pc端:散件盘点
|
6 years ago |
|
Silliter
|
ca118faefd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
e53418c2dc
|
提交代码
|
6 years ago |
|
柯裕
|
8692e0dc23
|
增加库存条码开窗查询
|
6 years ago |
|
Silliter
|
7e0f4b031f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
678d154b1f
|
需求变更：所有单据明细和条码查询条件去掉行号;生成入库单的明细的是否免费字段默认为计费
|
6 years ago |
|
gragon.xu
|
485ac1998c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
11fd6979ed
|
盘点pc端
|
6 years ago |
|
Silliter
|
0589b5e79a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
amy
|
07c227769d
|
修改
|
6 years ago |
|
Silliter
|
e61669dd98
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Rock.Yu
|
28458ac2fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Rock.Yu
|
a222cf09d9
|
1. PDA通用组件测试代码修改
|
6 years ago |
|
jimmy
|
18964b2977
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
f04cb00994
|
盘点pc端
|
6 years ago |
|
gragon.xu
|
0863e49b1a
|
任务合并查询明细错误：基础查询方法改版
单据任务生成状态默认：10创建
交易处理组件：移动单不一定有关联单据，代码错误
|
6 years ago |
|
Rock.Yu
|
8a10110f4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Rock.Yu
|
a49647f275
|
1. 增加注解
|
6 years ago |
|
amy
|
74651aa817
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
34cadcfb54
|
更新库容公用方法优化
|
6 years ago |
|
jimmy
|
64fd37652d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
1d57eb5a10
|
盘点pc端
|
6 years ago |
|
Silliter
|
92c5457521
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
6c1316f262
|
合并代码
|
6 years ago |
|
Silliter
|
1adb344e31
|
优化流程管家
|
6 years ago |
|
gragon.xu
|
59b086dc5d
|
BaseBean.findByHqlWhere:查询别名代码错误
WmsHqlPack:修改封装方法使用DdlHqlPack
任务合并代码错误
|
6 years ago |
|
amy
|
02483b4f92
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
0825229a78
|
移库单明细实体修改
|
6 years ago |
|
Silliter
|
b9d013280f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
2e9ed6a288
|
散件盘点
|
6 years ago |
|
yunhao.wang
|
19a57e8c3e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
柯裕
|
2988f34bbd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
6b89f8d572
|
更新实体
|
6 years ago |
|
amy
|
fcc36ef7f6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
amy
|
c1b477dd32
|
修改
|
6 years ago |
|
柯裕
|
c43a166a25
|
优化module
|
6 years ago |
|
Silliter
|
fa2303d838
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
柯裕
|
956c8c0362
|
增加临时变量
|
6 years ago |
|
Silliter
|
ee1488d28e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
柯裕
|
1f11a6f280
|
更新实体
|
6 years ago |
|
Silliter
|
e8deda24fe
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
柯裕
|
6944deef54
|
实体类更新
|
6 years ago |
|
jimmy
|
a6dd9e53ec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
3902dcca43
|
盘点PDA端
|
6 years ago |
|
amy
|
006fe4b95a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
ecdd1d45de
|
是否散件枚举添加
|
6 years ago |
|
柯裕
|
98d4f691f1
|
优化
|
6 years ago |
|
Silliter
|
fe644066af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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
|
0e9315cd89
|
作业任务生成事务控制
|
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 |
|
柯裕
|
9477ba5c91
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
26b4f3e5b4
|
调整微服务入参
|
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 |
|
柯裕
|
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
|
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
|
b41e06f412
|
wmsPOMasterDetails erpWhNo---》 erpAeraNo
|
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 |