陈思洁
|
d47c9f8650
|
合并冲突pojo
|
6 years ago |
|
陈思洁
|
f0e0867e2c
|
库存移动pojo新增字段
|
6 years ago |
wei.peng
|
a1f8ca3096
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
shiyanghuan
|
b330676d61
|
库存报表业务改动以及bug修改
|
6 years ago |
|
shiyanghuan
|
af278555d0
|
库存报表业务改动以及bug修改
|
6 years ago |
 曾贞一
|
019087fe48
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
曾贞一
|
71087e5d43
|
组织树 数据权限修复
|
6 years ago |
Chnx
|
0c841b645e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Chnx
|
8f182f962d
|
库存移动单查询接口
|
6 years ago |
刘敏
|
d2839f6cf2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
58b067e3cc
|
库存报表存储区级联子存储区查询
|
6 years ago |
peter.pan
|
5741bfa2e6
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
5bed1d27ec
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
79b36a30a4
|
冲突合并
|
6 years ago |
|
陈思洁
|
fe3d392e9b
|
新增枚举信息
移库单明细表冗余主表临时字段
新增物料表字段
|
6 years ago |
|
wei.peng
|
d7cb05e390
|
树DEMO 功能完成
|
6 years ago |
|
wei.peng
|
6cd229e286
|
本地无法启动,更新代码
|
6 years ago |
|
曾贞一
|
1f0bfd4554
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
cf96de8043
|
盘点 盘点差异结果同步ERP
|
6 years ago |
|
刘敏
|
8f5d952c4f
|
单位查询工厂添加
|
6 years ago |
|
peter.pan
|
f3eb8d2356
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
541b40d182
|
合并代码
|
6 years ago |
|
peter.pan
|
53135c27f5
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
b39d7038fa
|
Merge branch 'dev' into test
|
6 years ago |
许心洁
|
e6d60f6886
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
dec3743911
|
流程管家推队列查询条件没有封装
|
6 years ago |
|
wei.peng
|
2cbc082c7b
|
动态对象 空数据处理
|
6 years ago |
|
peter.pan
|
1d9683b05f
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
36b2d36fdd
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
51753bb237
|
bug#4515
|
6 years ago |
|
peter.pan
|
1b10c4ee63
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
32a563e053
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
dcb9b59ec9
|
新增一个实体封装
|
6 years ago |
|
peter.pan
|
eeefb843b4
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
37b8755485
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
37022efee8
|
合并代码
|
6 years ago |
|
wei.peng
|
78cfff1748
|
功能优化
|
6 years ago |
汪云昊
|
d3deaa6081
|
安灯bug解决
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
|
6 years ago |
|
shiyanghuan
|
073393a5b1
|
bug修改
|
6 years ago |
|
shiyanghuan
|
7dd78d1983
|
bug修改
|
6 years ago |
|
shiyanghuan
|
172fc81bee
|
bug修改
|
6 years ago |
|
wei.peng
|
9dc634d63e
|
用户查询功能优化
|
6 years ago |
|
许心洁
|
e43c493463
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
994da92b4e
|
交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG
|
6 years ago |
|
peter.pan
|
c02d22ecba
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
b18d393fe0
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
b684bd2355
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
81ed2465e3
|
盘点实盘信息 增加字段 是否范围内
|
6 years ago |
|
peter.pan
|
e95db40c23
|
123
|
6 years ago |
|
peter.pan
|
52addcf5ea
|
Merge branch 'dev' into test
|
6 years ago |
|
shiyanghuan
|
7ee861d61e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
2c28d6303f
|
bug修改
|
6 years ago |
|
peter.pan
|
543171dfbb
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
f853f06ceb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
97b60f0906
|
下线结算HQL的BUG
|
6 years ago |
jiajack
|
b34ddf5f64
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
681ca7eebe
|
修改取值为空时的问题
|
6 years ago |
|
wei.peng
|
1ac5542541
|
动态表单分页功能完成
|
6 years ago |
|
peter.pan
|
c436c8ee3d
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
bd28a7ac63
|
Merge branch 'dev' into test
|
6 years ago |
|
peter.pan
|
1ee48f4ef8
|
xxx
|
6 years ago |
|
陈思洁
|
fede09a5eb
|
WMS_ERP库存移动表修改item的数据类型
|
6 years ago |
|
刘敏
|
7be287137a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
19b5764776
|
收货回执打印信息新增 供应商字段新增 出库条码规则校验修改
|
6 years ago |
|
jiajack
|
7b70f47c64
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
27ba751a09
|
修改iqc数据库默认值
|
6 years ago |
|
peter.pan
|
e3354f52bd
|
Merge branch 'dev' into test
|
6 years ago |
|
shiyanghuan
|
52b9e09835
|
条码打印-条码模糊查询
|
6 years ago |
|
陈思洁
|
92daec97e3
|
枚举修改名字
|
6 years ago |
|
许心洁
|
47d8360a3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
9b9f94f059
|
盘点调差暂时处理
|
6 years ago |
|
peter.pan
|
b8730fac47
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
ac5bf14d6b
|
动态表单动态操作 功能优化
|
6 years ago |
|
许心洁
|
ebf517cb3d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
81eb13bafd
|
写入SAP单据锁定表
|
6 years ago |
|
许心洁
|
15386ae5c2
|
枚举
|
6 years ago |
|
peter.pan
|
628f1db31c
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
842f322188
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
529617a8b7
|
优化
|
6 years ago |
|
汪云昊
|
ff9a5dcd17
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
4fe3701929
|
还原
|
6 years ago |
|
汪云昊
|
98de08ba4a
|
文件上传优化
字段删除异常
日志添加索引
|
6 years ago |
|
peter.pan
|
96264870c2
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
efbe9dac9e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
bf02cbf8a4
|
PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
|
6 years ago |
|
shiyanghuan
|
cef6d9c3ad
|
bug修改
|
6 years ago |
|
peter.pan
|
99710d5c20
|
Merge branch 'test'
|
6 years ago |
|
shiyanghuan
|
da5d5d1af0
|
客户编号-模糊查询
|
6 years ago |
|
peter.pan
|
9c38ed702a
|
Merge branch 'dev' into test
|
6 years ago |
|
shiyanghuan
|
e00a0a9d9d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
c2609be241
|
作业类型分页查询 模糊查询
|
6 years ago |
|
刘敏
|
97adebba21
|
枚举新增 实体字段新增
|
6 years ago |
|
刘敏
|
eefaf55f24
|
供应商字段类型修改
|
6 years ago |
|
刘敏
|
7fc7fab54c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
493fbb83d9
|
条码查询条件
|
6 years ago |
|
peter.pan
|
3b1d19bbab
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
a7fbc9e58f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
b5ff789263
|
开发 wms推送AMP库存数据
|
6 years ago |
|
陈思洁
|
a8dee4713a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
31f6f4deef
|
枚举字段新增AMP
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
|
6 years ago |