刘敏
|
baf39dc0ce
|
生产退料导入实体新增
|
6 years ago |
|
刘敏
|
809478be44
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d8bc8d713d
|
条码打印model字段添加
|
6 years ago |
wei.peng
|
41588f37d7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
bleakney.liu
|
2c146d39bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
bleakney.liu
|
e52c310d38
|
add 入库pojo 和response
|
6 years ago |
jimmy.zeng
|
4bfa05698f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
 曾贞一
|
9e2169fa87
|
推荐入库 组件开发
|
6 years ago |
|
曾贞一
|
512ebb495c
|
VDA收货 提交组件
|
6 years ago |
于学杰
|
f6bb2ee21f
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
f17c1d3d25
|
推荐入库 组件开发
|
6 years ago |
jenkins
|
26179650f0
|
Merge branch 'dev' into test
|
6 years ago |
许心洁
|
787f12387d
|
流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理
|
6 years ago |
|
jenkins
|
bca4f7745f
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
de6792426e
|
流程管家：单据完成提交所有待提交移动单；只推送当前移动单
PDA收货组件：改数后删除历史记录BUG修复
|
6 years ago |
|
wei.peng
|
4ca0851386
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
d509e5755a
|
vda 收货超收处理
|
6 years ago |
|
jenkins
|
603647bc82
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c5f43236a3
|
开口合同与po关系
|
6 years ago |
汪云昊
|
f978ee39c8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
于学杰
|
05dc432c57
|
1. 增加关联单位和关联数量字段
|
6 years ago |
|
jimmy.zeng
|
bd466610d5
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
72fec8146d
|
修改
|
6 years ago |
|
jimmy.zeng
|
d23045a667
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
5b6477bba6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
510485d2f0
|
excel导出优化--单据状态显示枚举描述
|
6 years ago |
|
许心洁
|
59569cef66
|
移动单主表去掉乐观锁（处理错误移动单JOB一个事务内对一个表进行了两次操作不行，导致程序直接挂掉，事务也没回滚）+
交易处理组件（出入移库）：待入库的可能是不合格的+
公共PDA组件抛异常获取值为空
|
6 years ago |
crish
|
35beb0c60e
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
02270ea6e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
f5d2398e0e
|
VDA收货--开口合同增加字段
供应商增加字段
|
6 years ago |
|
于学杰
|
01c58e8653
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
3454712bd2
|
1. 增加库存快照的类文件
|
6 years ago |
|
刘敏
|
5b7ac2c344
|
ASN字段修改
|
6 years ago |
|
刘敏
|
c7734b7e26
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
5144d15ac4
|
采购单报表开发
|
6 years ago |
|
crish
|
bbfc9b320f
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
03ef38f853
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
315787197a
|
交易处理组件（收货）：免检写入收货事务取目的库位的值+乐观锁去掉临时属性
|
6 years ago |
|
曾贞一
|
b5dfa7dbd2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
8d6e4fdfa5
|
盘点实盘导入功能
|
6 years ago |
|
陈思洁
|
677632748d
|
VDA收货逻辑组件修改--修改sql中增加库存地字段显示
|
6 years ago |
|
刘敏
|
4c39e84094
|
asn主表添加
|
6 years ago |
|
陈思洁
|
3b174fc782
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
f63cd5071b
|
新增开口合同实体
|
6 years ago |
|
许心洁
|
a959964950
|
移动单三张表加上乐观锁
|
6 years ago |
|
jimmy.zeng
|
ccffe9b7bd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
229587fcf3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ceced4c4b6
|
欧洲项目 检查数量 批次格式组件编写
|
6 years ago |
|
刘敏
|
241a478f65
|
excel导出优化--单据状态显示枚举描述
|
6 years ago |
|
刘敏
|
f0fba5e23a
|
盘点枚举添加--excel导出
|
6 years ago |
|
刘敏
|
8ac4f214b3
|
#5596
|
6 years ago |
|
jimmy.zeng
|
836b0e933e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
09aab6d87a
|
盘点添加 存储区多个查询
|
6 years ago |
|
jimmy.zeng
|
a4725e20c6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
a12a008713
|
盘点库位添加查询条件
|
6 years ago |
|
jimmy.zeng
|
fd76f08af4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
8b9a4fb109
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
575aa6ea2f
|
库存移动单报表 添加修改人，修改时间的查询条件和列表
|
6 years ago |
|
刘敏
|
e4cf678000
|
构造新增字段
|
6 years ago |
|
jimmy.zeng
|
8f1ac3fdae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
c05b22668f
|
字段修改
|
6 years ago |
|
jimmy.zeng
|
835245f8f4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
2108a7f8e7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
4852a4754c
|
字段枚举值添加
|
6 years ago |
|
许心洁
|
7da95b1ad2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
876571e877
|
任务：994；BUG：5498
|
6 years ago |
|
jimmy.zeng
|
6e48f0a677
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
d8568e6d22
|
盘点优化代码。
|
6 years ago |
|
曾贞一
|
5290ba6f63
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
01cb76da6d
|
指令移库 根据目标存储区扫描库位
|
6 years ago |
|
刘敏
|
836f1bf870
|
字段修改
|
6 years ago |
|
陈思洁
|
2af903f029
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
254f08da32
|
物料描述修改
|
6 years ago |
|
jimmy.zeng
|
2e8a70d8b4
|
pom版本还原--pojo
|
6 years ago |
|
刘敏
|
0faeaa6047
|
导出枚举添加
|
6 years ago |
|
刘敏
|
193eba75d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
5b735fe3a2
|
移动单枚举导出
|
6 years ago |
|
许心洁
|
71b6c64ed0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
刘敏
|
5f539afd6d
|
移动单明细注解添加
|
6 years ago |
|
许心洁
|
84ace781a3
|
流程添加默认值方式错误
|
6 years ago |
|
许心洁
|
503b68a0a5
|
拉了测试的代码POM文件错乱
|
6 years ago |
|
许心洁
|
6068ca9fd8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
cafd923d3a
|
流程管家：添加作业记录明细（作业记录不再更新移动单号：一个步骤记录一个作业记录明细）
|
6 years ago |
|
许心洁
|
706ddcbba7
|
流程新增初始化组件明细组件赋默认值0
|
6 years ago |
|
jimmy.zeng
|
4f58949e2d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
5ea81cc34e
|
实体修改
|
6 years ago |
|
陈思洁
|
2a90329fcf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
63be82f044
|
实体修改
|
6 years ago |
|
jimmy.zeng
|
73b6088977
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
d484efb69e
|
明细构造新增
|
6 years ago |
|
crish
|
5e06022e51
|
Merge remote-tracking branch 'remotes/origin/dev'
|
6 years ago |
|
jimmy.zeng
|
2a7ba550d6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
b1dd7d3915
|
合并冲突
|
6 years ago |
|
陈思洁
|
d269576dbf
|
新增字段
|
6 years ago |
|
jimmy.zeng
|
154730e69b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
ac1090d661
|
报表返回字段信息添加
|
6 years ago |
|
曾贞一
|
ae12af551b
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
cfc0de67cf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
56a4d6b362
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
19253a9b6a
|
构造函数新增条码
|
6 years ago |
|
wei.peng
|
96a29d3de8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
18dac2b569
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy.zeng
|
1b06c1d07f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
592cd15add
|
调试枚举删除、库位导入工厂字段添加
|
6 years ago |
|
许心洁
|
9de4d79009
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
d2036fd841
|
任务961，962，966，973
|
6 years ago |
|
曾贞一
|
25e7ca08d3
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
7e5d2e1e56
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
18eff49e63
|
hql语句拼接修改
|
6 years ago |
|
陈思洁
|
11aff72404
|
新增冗余字段
|
6 years ago |
|
曾贞一
|
5aceaca82d
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
61822039c5
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
3f5f89bd1b
|
流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）
|
6 years ago |
|
曾贞一
|
18aff86ea0
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
188e2b5efd
|
pom版本还原
|
6 years ago |
|
于学杰
|
921859b996
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
fe65067ca2
|
1. 增加 IOT 接口配置表的 POJO
|
6 years ago |
|
曾贞一
|
b10b967b73
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
d340133e7a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
f56f8d714b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
617bb73dad
|
增加业务类型字段、修改临时变量字段类型
修改hql查询字段
|
6 years ago |
|
刘敏
|
a83b552203
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
2bc04b407e
|
计划日期、时间新增
|
6 years ago |
|
许心洁
|
cb49d8d848
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
ffb6f8a17c
|
任务列表不分页，主要查询字段加索引
|
6 years ago |
|
jimmy.zeng
|
4359f347c6
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
acd1e6cfb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ce70994a57
|
盘点 按照盘点差异类型汇总
|
6 years ago |
|
jimmy.zeng
|
a2a4dc6beb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
4d00397411
|
修改盘点范围的排序规则
|
6 years ago |
|
wei.peng
|
e8741ec364
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
b3a552d65d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
070bacf20e
|
所有外部单据增加创建时间和创建人的查询条件
|
6 years ago |
|
曾贞一
|
7fab9a4d89
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
0d532b78c0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
e1cb06da5c
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
483ea59142
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
7a935276a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
bc953bb2c8
|
查询条件封装
|
6 years ago |
|
刘敏
|
de381d438a
|
领料单模板创建
|
6 years ago |
|
曾贞一
|
9d70008912
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
61ce4d1b3f
|
优化
|
6 years ago |
|
汪云昊
|
b9d9d7402e
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
ef40914935
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
e9c596adce
|
盘点hql排序修改
|
6 years ago |
|
jimmy.zeng
|
02baed5dbf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
4573b09392
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
2058789438
|
盘点业务修改bug
|
6 years ago |
|
jimmy.zeng
|
7002ac5a8a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
abf155ecd9
|
库存报表 创建人、创建时间添加
|
6 years ago |
|
jimmy.zeng
|
221f05b175
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
839c139222
|
库存移动条码报表优化
|
6 years ago |
|
jimmy.zeng
|
235498b162
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
638d9cb1a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9ff9c11c97
|
字段调整
|
6 years ago |
|
曾贞一
|
fbe8544a02
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
cef48801df
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
a713e835fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
aee54acafc
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
ff52a412d4
|
库存初始化信息
|
6 years ago |
|
陈思洁
|
b604c5d9a0
|
交易记录增加字段
|
6 years ago |
|
许心洁
|
92d4bf46ce
|
#5255,#5039
|
6 years ago |
|
曾贞一
|
7a62200736
|
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
6 years ago |
|
曾贞一
|
7ca6e46e4b
|
Merge branch 'dev' into test
|
6 years ago |
|
jimmy.zeng
|
bf293d4758
|
生产报工时，原材料move单号写入关联移动单号中
|
6 years ago |
|
刘敏
|
dacc203119
|
库存报表修改
|
6 years ago |
|
曾贞一
|
380efb664e
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
8034e9e505
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
da1c9af3d4
|
库存报表新增
|
6 years ago |
|
曾贞一
|
47d4a53706
|
Merge branch 'dev'
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
6 years ago |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
|
于学杰
|
4235184afc
|
Merge branch 'Process' into dev
|
6 years ago |
|
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
|
于学杰
|
24da688384
|
Merge branch 'test' into dev
|
6 years ago |
|
许心洁
|
b3f4e62a74
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
刘敏
|
794d4b69d6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
145600a5d0
|
单据查询精准查询
|
6 years ago |
|
许心洁
|
31313baec9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
许心洁
|
f6c425c649
|
平台获取设备ID方式改变+所有pojo加上序列化
|
6 years ago |
|
曾贞一
|
3db421b825
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
b3a0a71065
|
库存初始化信息
|
6 years ago |
|
wei.peng
|
837d6ea567
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
af7b2404dd
|
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
|
6 years ago |
|
许心洁
|
d8786d8132
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
a4f2a7c848
|
hql修改asn订单明细
|
6 years ago |
peter.pan
|
f365dc197f
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
4d83030c51
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
6431417462
|
dragon
|
6 years ago |
|
许心洁
|
fb0cc3446b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
1037f55f7e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
30750923d1
|
字段修改类型
|
6 years ago |
|
刘敏
|
871dbed84a
|
查询条件封装
|
6 years ago |
|
peter.pan
|
363d521c36
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
d45b7b77f3
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
f20c33b7f5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
898e1d39d4
|
盘点结果回传ERP，写入move_to_erp时做单位转换
原材料扣减，单位转换
|
6 years ago |
|
许心洁
|
bb8078cb94
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
059688410c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
17be4078be
|
设备信息开发
|
6 years ago |
|
许心洁
|
b2328bb085
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
901fea5339
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
1fe05ab150
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c3fe273954
|
解决冲突
|
6 years ago |
|
许心洁
|
60e6d51d35
|
流程管家2.0
|
6 years ago |
|
peter.pan
|
39c5866084
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
4393c02bb3
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
4bad223c0d
|
直送发运JOB
|
6 years ago |
|
曾贞一
|
7a4d68c409
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
a7144e3a1f
|
同步标识 2
|
6 years ago |
|
刘敏
|
e09ad49fc9
|
物料新增结算供应商字段
|
6 years ago |
|
peter.pan
|
161f8faee5
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
1c69b311a6
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
bfcd3ebaf0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
peter.pan
|
19871c5f27
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
8f977719c0
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
0a78cf4ec5
|
数字类型新增get
|
6 years ago |
|
许心洁
|
ce7095932c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
1de613a09c
|
同步频率
|
6 years ago |
|
peter.pan
|
31d49a1298
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
739f12657e
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
07008f8e1b
|
实体修改
|
6 years ago |
|
peter.pan
|
562ea029fc
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
5c48b2eb79
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
df49ab097b
|
赋默认值“待同步”为1
|
6 years ago |
|
刘敏
|
f8fd8dbab0
|
同步标识修改
|
6 years ago |
|
peter.pan
|
47238f131b
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
8daa2789a4
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
1d1a2ac8b1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
cf33f70e31
|
代码规范
|
6 years ago |
|
刘敏
|
2aa1e9811e
|
数字类型方法重写
|
6 years ago |
|
peter.pan
|
fdfdc9befb
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
bc9ac8d207
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
98d660f907
|
实体新增
|
6 years ago |
|
刘敏
|
7811157312
|
实体字段新增
|
6 years ago |
|
曾贞一
|
792dc0a190
|
WMS_MOVE_TO_ERP 增加字段年份
|
6 years ago |
|
peter.pan
|
0692087834
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
5a195bfe2e
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
2045b33801
|
单据锁定 SapOrderLock 添加字段同步标识
|
6 years ago |
|
许心洁
|
6e30549ad4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
00fc0de4a9
|
冲突
|
6 years ago |
|
许心洁
|
742e0a6f49
|
冲突
|
6 years ago |
|
于学杰
|
6598a829e0
|
Merge branch 'dev'
|
6 years ago |
jenkins
|
7bcff3cc66
|
Merge branch 'dev' into test
|
6 years ago |
|
jenkins
|
cd70d9f66a
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
89edbcb80a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
98041fe58d
|
流程管家优化
|
6 years ago |
|
刘敏
|
b4a538ebb5
|
单位换算
|
6 years ago |
|
曾贞一
|
0341dd2f5e
|
bug #5030
|
6 years ago |
|
jenkins
|
bc7267b777
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
63d7c2c6b8
|
1. 增加脚本引擎的POJO注释
|
6 years ago |
|
刘敏
|
eafdcac5a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
23c4b0742d
|
库存条码管理查询条件封装
|
6 years ago |
|
jenkins
|
595a81f4b9
|
Merge branch 'dev' into test
|
6 years ago |
|
jenkins
|
812be94ed3
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
d5d6e21a15
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
8c5f7906af
|
bug #5038
bug #5045
|
6 years ago |
|
刘敏
|
03a261a048
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jenkins
|
8c9a790faa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
0fc49d5b2a
|
IQ、OQ增加工厂字段
|
6 years ago |
|
刘敏
|
9a61249756
|
库存条码管理查询条件封装
|
6 years ago |
|
曾贞一
|
062f4becf4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
471aec30fe
|
开发 WIP报废出库
|
6 years ago |
|
jenkins
|
11cdc2bfa3
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
ddedecc11c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
5d7a44cec3
|
库存条码管理查询条件封装
|
6 years ago |
|
曾贞一
|
1716628563
|
开发 发泡打箱包装job
|
6 years ago |
|
jenkins
|
409cbb8492
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
db3d47cd6e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
4a717ec544
|
直送发运JOB+交易处理程序（下线结算）逻辑变动
|
6 years ago |
|
jenkins
|
f4141fd2c6
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c3ddcbb81a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
86d3f8de48
|
开发 发泡打箱包装job
|
6 years ago |
|
jenkins
|
40e20f7054
|
设备编号
|
6 years ago |
|
jenkins
|
c969b09b85
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
3f5c28e1af
|
盘点单 优化提交组件回显信息
复盘开发
部分业务增加模糊查询
|
6 years ago |
|
jenkins
|
e3819b31f5
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
7d5ea5bfec
|
客户物料号默认值
|
6 years ago |
|
jenkins
|
577e1372ab
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
a064c6b84a
|
枚举新增条码类型
库存条码表新增字段
|
6 years ago |
|
peter.pan
|
4149183450
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
48ab7a49d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
ecd72ed41e
|
ASN订单明细数据新增分组查询接口
|
6 years ago |
|
peter.pan
|
e2fde20be5
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
73b5758dc4
|
移动单主表返回数据
|
6 years ago |
|
peter.pan
|
460dff866f
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
77d6345c15
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
6a2b19d3e3
|
bug #4953
|
6 years ago |
|
peter.pan
|
79d4055ab7
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
9a60664fb3
|
需求变更：ASN订单类型为AMP时任务明细的业务类型描述要给AMP
+BUG:交易处理组件：下线扣减：物料可能没有维护默认入库库位
|
6 years ago |
|
peter.pan
|
541198a1e9
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
d258b846ac
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
483b93cb9f
|
bug #4939
#4914
|
6 years ago |
|
陈思洁
|
25d8df360d
|
实体字段修改hql
|
6 years ago |
|
peter.pan
|
0526fcf05c
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
df8d025668
|
接口映射表基础数据维护
|
6 years ago |
|
陈思洁
|
a3ccb4d449
|
hql提交
|
6 years ago |
|
peter.pan
|
7c8e02c0c9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
51efe95e86
|
pojo
|
6 years ago |
|
陈思洁
|
1514f9434e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
623d17a2ec
|
字段默认值赋值
|
6 years ago |
|
刘敏
|
b941354087
|
盘点导入默认值
|
6 years ago |
|
于学杰
|
6ba7a43ea7
|
Merge branch 'dev'
|
6 years ago |
|
于学杰
|
4350a82043
|
1. 完善脚本引擎
|
6 years ago |
|
于学杰
|
ca658628c8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
# pom.xml
|
6 years ago |
|
刘敏
|
72ac1f39f4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d75570c987
|
库存报表问题修改
|
6 years ago |
|
于学杰
|
5dc8cd5bda
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
02044789dc
|
1. TO ERP 增加单据行号字段
2. 脚本引擎 & 规则引擎 增加工厂代码
|
6 years ago |
|
陈思洁
|
f26cdda8ec
|
实体新增字段
|
6 years ago |
Chnx
|
eb4914ae7a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Chnx
|
9c189dce3c
|
库存移动单查询接口
|
6 years ago |
|
peter.pan
|
24f7ae3471
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
53d34096f7
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
cf7957525a
|
盘点指令默认值赋值
|
6 years ago |
|
刘敏
|
6861d44a1c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
a1a77b63db
|
下线结算标识、是否录入生产批次。
POJO默认赋值2
|
6 years ago |
|
peter.pan
|
d9ef2677fb
|
Merge branch 'dev' into test
|
6 years ago |
shiyanghuan
|
b2866c85dd
|
bug修改
|
6 years ago |
|
peter.pan
|
f4613c2f5c
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
61ecc2a74f
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
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 |
|
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 |
|
曾贞一
|
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
|
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 |
|
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
|
eeefb843b4
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
37b8755485
|
Merge branch 'dev' into test
|
6 years ago |
|
shiyanghuan
|
073393a5b1
|
bug修改
|
6 years ago |
|
shiyanghuan
|
7dd78d1983
|
bug修改
|
6 years ago |
|
shiyanghuan
|
172fc81bee
|
bug修改
|
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 |
|
曾贞一
|
81ed2465e3
|
盘点实盘信息 增加字段 是否范围内
|
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
|
681ca7eebe
|
修改取值为空时的问题
|
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 |
|
许心洁
|
9b9f94f059
|
盘点调差暂时处理
|
6 years ago |
|
peter.pan
|
b8730fac47
|
Merge branch 'dev' into test
|
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 |
|
peter.pan
|
628f1db31c
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
529617a8b7
|
优化
|
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 |
|
刘敏
|
16301be9dc
|
JOB开发实体新增
|
6 years ago |
|
刘敏
|
3090b2aaad
|
实体缺失字段新增
|
6 years ago |
|
刘敏
|
8cbc19eb37
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
da12d8f6b0
|
错误信息字段冗余
|
6 years ago |
|
许心洁
|
c7aca0a94d
|
交易处理主程序转换数据错误+出入移库查找添加条件
|
6 years ago |
|
peter.pan
|
f4bf536296
|
Merge branch 'test'
|
6 years ago |
|
wei.peng
|
ee5a4f1dfe
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
703dc6851c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
f85a0296ae
|
开发 bom拆解功能
|
6 years ago |
|
于学杰
|
dd2408cd4a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
72ef115db8
|
1. 批次字段不允许为空
|
6 years ago |
|
刘敏
|
0a69cddb53
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
b98b48e4e5
|
SAP_产品报工汇总表新增
|
6 years ago |
|
陈思洁
|
ede4458709
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
6f41158ecb
|
生产发运新增实体属性
|
6 years ago |
|
刘敏
|
08af5fde04
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
a551249165
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
bc6d7f5c4d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
e7bd528736
|
1. 设置 is_sync 字段不允许为空，默认值为 2
|
6 years ago |
|
陈思洁
|
d9d776060f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
557880ffd2
|
生产报工明细实体修改
|
6 years ago |
|
shiyanghuan
|
b29d5722bc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
31b7e2d8dc
|
库存交易报表和未完成订单报表bug修复
|
6 years ago |
|
peter.pan
|
d39c16c5d5
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
49d35f264e
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
35f92b05e3
|
1. 修改ERP接口暂存表的字段，增加关联单据类型
|
6 years ago |
|
刘敏
|
787eaaf53d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1ee9cb24f2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
于学杰
|
2b1414814c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
baeb202ca5
|
1. 增加查询系统配置参数的结构
|
6 years ago |
|
peter.pan
|
7861048e31
|
Merge branch 'test'
|
6 years ago |
|
陈思洁
|
1b1f2aca51
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
2ce560b39f
|
生产报工明细实体修改和枚举新增
|
6 years ago |
|
刘敏
|
7ac3509f96
|
状态查询添加是否有效
|
6 years ago |
|
shiyanghuan
|
400b380b55
|
未完成订单查询报表代码提交
|
6 years ago |
jenkins
|
470d319504
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
4a4a50638c
|
生产报工明细实体提交
|
6 years ago |
|
刘敏
|
98229202b8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d91c9138b3
|
字段新增
|
6 years ago |
sky.meng
|
2f1a3080ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
05c56e46b4
|
库存预警看板开发
|
6 years ago |
|
刘敏
|
d7f15cddef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
ae4e31e22c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
484c5942e8
|
所有业务单据Item属性都用String类型
|
6 years ago |
|
peter.pan
|
176f9ffd5f
|
Merge branch 'test'
|
6 years ago |
|
刘敏
|
eb7ff3fd40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
4b924c64a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
peter.pan
|
af7e8d7a43
|
组织码
|
6 years ago |
|
刘敏
|
e42c238d16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7c28110bd4
|
代码忘了发起合并请求
|
6 years ago |
|
刘敏
|
cd566574cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
713503d7ff
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
91f1a120a2
|
1. 修改编译不过的代码
|
6 years ago |
|
于学杰
|
5d1447c92a
|
1. 解决标准拣货多级存储区查找的问题
|
6 years ago |
|
peter.pan
|
ced56de9de
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
b1ca55e3a3
|
pojo
|
6 years ago |
|
许心洁
|
41324abdad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b13a9cd79c
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
|
sky.meng
|
854ee5b3cf
|
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
|
6 years ago |
|
sky.meng
|
0f3d67d110
|
供应商收货看板功能完成
|
6 years ago |
|
许心洁
|
8ba2173753
|
冲突
|
6 years ago |
|
许心洁
|
8347085f26
|
冲突
|
6 years ago |
|
刘敏
|
48589a10cb
|
默认字段修改
|
6 years ago |
|
许心洁
|
e3d5e5bb19
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
|
刘敏
|
945ef82867
|
实体字段新增
|
6 years ago |
|
wei.peng
|
eb2f61c32f
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
d0d9a467a3
|
乐观锁修改数字类型
|
6 years ago |
|
wei.peng
|
edc0dda102
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
62ae657151
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
71f6d48d16
|
修改流程管家实体--架构
|
6 years ago |
|
wei.peng
|
f32f7e72a2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
shiyanghuan
|
f3151cbbe3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
e13d4163b7
|
库存交易报表代码提交
|
6 years ago |
|
wei.peng
|
f1c49c1cae
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
4d37e2a095
|
合并
|
6 years ago |
|
wei.peng
|
9cc7c5d8b8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
2f595807ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
14a8afca83
|
优化 盘点代码
|
6 years ago |
|
刘敏
|
cabb4c9357
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
1a43546bd1
|
条码状态报表开发
|
6 years ago |
alwaysfrin
|
4ce22aaa3f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
d4dce36280
|
流程管家优化
|
6 years ago |
|
jenkins
|
e4cf82841f
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
663d8cdcf1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
aed953a03e
|
1. FIFO 推荐时要加上 sn_status = 40 的筛选条件
|
6 years ago |
|
刘敏
|
6aaf2f3f3e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
1f403ebe40
|
代码优化
|
6 years ago |
|
jenkins
|
c12cdea29f
|
Merge branch 'dev' into test
|
6 years ago |
|
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 |
|
汪云昊
|
0507cf7ee0
|
Merge remote-tracking branch 'remotes/origin/test'
|
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 |
|
汪云昊
|
f9955609bd
|
Merge remote-tracking branch 'remotes/origin/test'
|
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 |
|
汪云昊
|
91677f3c13
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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 |
|
陈思洁
|
add3f05985
|
数据权限hql修改
|
6 years ago |
|
wei.peng
|
33ec897657
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
|
陈思洁
|
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 |
|
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 |
|
许心洁
|
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 |
|
wei.peng
|
aa23889514
|
Merge branches 'dev' and 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
|
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
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
|
6ebc22e6cc
|
master分支配置调整
|
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 |
|
jenkins
|
12e2f1d1b8
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
85a44b1baa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
19f30ce4f9
|
流程配置+定时处理错误移动单给错误信息赋值过长
|
6 years ago |
|
jenkins
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
jimmy
|
f39abebd90
|
qc HQL修改
|
6 years ago |
|
Silliter
|
0291c3976e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
b1d8addd0f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jimmy
|
c72c2fa891
|
散件盘点
|
6 years ago |
|
刘敏
|
7ffa55fbe8
|
查询条件方法优化
|
6 years ago |
|
Silliter
|
f8b89c930b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
53dc8aaa15
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
2231000f9a
|
BUG#4050+基础数据服务划分代码优化
|
6 years ago |
|
刘敏
|
b61a2bbea7
|
实体数字类型get方法重写
|
6 years ago |
|
jenkins
|
850b372ab4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
yihang.lv
|
e790b209e5
|
sweb开窗改为微服务
|
6 years ago |
|
jenkins
|
068c4d0ad3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
51c5e36838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b17b15964f
|
交易处理主程序调用组件异常处理优化
|
6 years ago |
|
jenkins
|
2f57ee75d5
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
jimmy
|
5e625f45b8
|
增加WmsMoveMastersql
|
6 years ago |
柯裕
|
3d44d85633
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
da153214f9
|
优化
|
6 years ago |
|
jenkins
|
2a7564e7c2
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
931a4a04d3
|
开发全局配置接口
|
6 years ago |
|
jenkins
|
ed474fe112
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
afae8d085e
|
任务明细开发
|
6 years ago |
|
Silliter
|
c03c7d3331
|
自定义规则开发
|
6 years ago |
|
Silliter
|
b3f4ccbb78
|
自定义脚本开发
|
6 years ago |
|
jenkins
|
3b49d7d970
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
jimmy
|
bb811306ff
|
修改 wmsShopping 为 wmsShipping
|
6 years ago |
|
Silliter
|
c8c8dc6750
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yihang.lv
|
7da6627878
|
sweb通知公告
|
6 years ago |
|
jenkins
|
b1497a8565
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
0eb50142fe
|
优化查询
|
6 years ago |
|
Silliter
|
62bcef22a8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jessica.chen
|
580d25a8f8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jessica.chen
|
48eedb360e
|
调用库存条码信息查询sql优化
|
6 years ago |
|
Silliter
|
660a95c879
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
19f62ab850
|
实体添加查询索引
|
6 years ago |
|
柯裕
|
7a7a875bef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
0294f12b5b
|
优化hql
|
6 years ago |
|
jessica.chen
|
0cc66369c2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jessica.chen
|
6d2f783930
|
库存信息、库存条码信息、库存交易、库存交易条码sql优化
|
6 years ago |
|
柯裕
|
3192d0cd2d
|
hqlpack优化
|
6 years ago |
|
jenkins
|
64e8d6dd9d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
ef071e2bbf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
8346b4c6f6
|
查询条件优化
|
6 years ago |
|
jessica.chen
|
15a399e86d
|
产品发运、抽点记录、质检三张表的查询sql优化
|
6 years ago |
|
jenkins
|
530162c0c6
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
柯裕
|
cf4b412180
|
优化sql查询
|
6 years ago |
|
刘敏
|
3918b6b8e3
|
move查询条件优化
|
6 years ago |
|
刘敏
|
54211af6f4
|
asn查询条件优化
|
6 years ago |
|
刘敏
|
54af172d43
|
供应商查询条件优化
|
6 years ago |
|
刘敏
|
06a42e315b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
a6d0def85d
|
查询条件优化
|
6 years ago |
|
jimmy
|
aca664fc4f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jimmy
|
1aee9a6cf5
|
修改基础数据的findByHqlWhere方法
|
6 years ago |
|
Silliter
|
6aec563884
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
927799e1db
|
更新库容方法优化
|
6 years ago |
|
jenkins
|
4a5d0f0cb3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
amy
|
a91ff1feaf
|
查询优化
|
6 years ago |
|
amy
|
062d56573f
|
查询修改
|
6 years ago |
|
amy
|
06dd8b42da
|
查询优化
|
6 years ago |
|
jenkins
|
fb4be4580d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
gragon.xu
|
1a8a6418d8
|
物料分页查询条件加上“snControl”
|
6 years ago |
|
gragon.xu
|
3926ba11c1
|
监控台
|
6 years ago |
|
gragon.xu
|
ec9764d3d7
|
d
|
6 years ago |
|
jenkins
|
15d53b47ec
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
Silliter
|
afac75bb2b
|
质检明细删除问题修改
看板卡新的moveno生成问题
任务操作问题
校验库容问题
|
6 years ago |
|
Silliter
|
ac70ce91fd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
8d1567a0b5
|
根据任务关联单号模糊匹配任务列表
|
6 years ago |
|
Silliter
|
5abb5d1821
|
任务列表优化
|
6 years ago |
|
Silliter
|
83ce4f0efb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
588a517ae1
|
任务列表接口优化
|
6 years ago |
|
gragon.xu
|
0744d38714
|
质检基础数据前后端调整：去掉入库单号，把关联单号作为查询条件；数据不可操作
|
6 years ago |
|
柯裕
|
ee33834f9a
|
优化
|
6 years ago |
|
jenkins
|
df63afecf8
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
gragon.xu
|
6396fb1a38
|
物料查询新增“snControl”条件
|
6 years ago |
|
Silliter
|
8a69224e05
|
优化入库和质检明细处理业务
|
6 years ago |
|
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 |
|
柯裕
|
913dcae75f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
85493e4f88
|
散件收货查询
|
6 years ago |
|
gragon.xu
|
2ce0dcbaf1
|
dragon
|
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
|
ec50aef781
|
开发单据打印
|
6 years ago |
|
jimmy
|
94f588cfdb
|
盘点PAD组件
|
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 |
|
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 |
|
gragon.xu
|
8ef0e787b9
|
交易反向处理
|
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 |
|
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
|
4aaa9bc03a
|
1.优化流程管家
2.开发条码打印，订单打印，收货回执打印
|
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 |
|
Silliter
|
6396056d08
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
jimmy
|
4e8ab00fed
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
6cf53459e2
|
修改代码
|
6 years ago |
|
amy
|
8df7fb3f4b
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
gragon.xu
|
78d551f8e7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gragon.xu
|
4ef08afaa7
|
dragon
|
6 years ago |
|
amy
|
bf24e3f58c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
ebc92f6290
|
实体新增临时字段
|
6 years ago |
|
jimmy
|
8d442fcafa
|
修改代码
|
6 years ago |
|
Jack.lv
|
5c6ab755dd
|
userTime改为userTime
|
6 years ago |
|
Jack.lv
|
eb37a1f7ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Jack.lv
|
fa4c4cd957
|
作业类型删除处理组件编号和数据来源编号
|
6 years ago |
|
Silliter
|
dcfb0f5cdf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
738db8d837
|
条码打印开发，角色微服务提供
|
6 years ago |
|
jimmy
|
f52b3ff189
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jimmy
|
8da671628c
|
盘点PC
|
6 years ago |
|
Silliter
|
618ce5d560
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
柯裕
|
bbfd340fd0
|
质检
|
6 years ago |
|
Silliter
|
e20936ca2b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
c4ef1e66f3
|
开发条码打印后端
|
6 years ago |
|
wei.peng
|
8ec8dba414
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
amy
|
6630842f3c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
amy
|
b883f7de2d
|
添加临时变量
|
6 years ago |
|
Jack.lv
|
630c6e8f66
|
作业处理组件增删改查、作业任务明细查询、作业任务生成日志查询完成
|
6 years ago |
|
Silliter
|
11bbe2a57d
|
优化流程管家
|
6 years ago |
|
Silliter
|
6464cbd533
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
gragon.xu
|
48161d95a1
|
枚举冲突
|
6 years ago |
|
gragon.xu
|
e7fa2f3abf
|
NC,盘点交易处理组件
|
6 years ago |
|
Jack.lv
|
972d2b04a7
|
wmshpak删除多余代码
|
6 years ago |
|
Silliter
|
62196df6bf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jessica.chen
|
30996a92a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jessica.chen
|
166b725e43
|
出库组件新增
|
6 years ago |
|
Silliter
|
74b63d8a72
|
开发流程管家根据任务创建流程
|
6 years ago |