bleakney.liu
|
f682d056be
|
[物流线路管理]修改查询条件
|
6 years ago |
许心洁
|
653c8dca1f
|
直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误
|
6 years ago |
 曾贞一
|
2b62357ab5
|
VDA收货【生产快速入库】组件，任务编号1051
|
6 years ago |
|
许心洁
|
10fcc569bd
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
e90c59ccf2
|
生产报工当查询到多条子物料时查询的SQL没有返回itemQty
|
6 years ago |
|
许心洁
|
e35cf183da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lbwgithub
|
4fc72ca358
|
条码模型
|
6 years ago |
|
lbwgithub
|
81d86d1bd2
|
条码模型
|
6 years ago |
|
许心洁
|
7a403a37da
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
jenkins
|
99382a8fca
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c509f3c707
|
VDA 生产快速入库
|
6 years ago |
|
jenkins
|
0982f01eb2
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
26684524f1
|
生产报工组件和生产报工标签组件提交
|
6 years ago |
|
jenkins
|
7e3edd06a0
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
3ba6508b0c
|
新增打印机配置表
|
6 years ago |
|
陈思洁
|
22fbbe2a91
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
edfc78995b
|
新增打印机配置表
|
6 years ago |
刘敏
|
8a94b054d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
c2a75d96da
|
实体字段get方法修改
|
6 years ago |
|
jenkins
|
607d8202ae
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
f1f712c997
|
流程管家关联查询流程明细BUG：导致流程错乱
|
6 years ago |
crish
|
9ae6ee5016
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
d5349806c9
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
dcf326366e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
8f7d3b371b
|
流程管家：回显给前端当前步骤参数类型
|
6 years ago |
|
jenkins
|
829171f8a4
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
e42cd80b8b
|
条码打印枚举添加待退料状态
|
6 years ago |
|
jenkins
|
38f2716a76
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
bc1dea29ad
|
po、asn查询条件添加
|
6 years ago |
|
jenkins
|
7ce12a9c85
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
522efe67b6
|
excel导出优化--单据状态显示枚举描述
|
6 years ago |
|
jenkins
|
cbc5882bd5
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
0f82f3fbe5
|
导出状态添加
|
6 years ago |
|
jenkins
|
c29c350ef8
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
e5591eafc5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
4b17c6ca69
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
e02f2bfeee
|
单据条码实体临时字段增加
|
6 years ago |
|
许心洁
|
ec3ef597e8
|
根据工厂代码调整库存
|
6 years ago |
|
crish
|
f3f77e63b3
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4d5497929a
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
ed29263655
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
adf699f618
|
移动单表是否快照临时字段新增
|
6 years ago |
|
bleakney.liu
|
53dd9cface
|
add 物流路线pojo
|
6 years ago |
|
刘敏
|
f6e9dd03b4
|
库存快照job开发【任务1011】
|
6 years ago |
|
刘敏
|
4e46760fb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
f57dd8e999
|
库存信息表、库存条码、移动单三张表快照时间新增
|
6 years ago |
|
曾贞一
|
6c8cfd8678
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
96fd66456e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
于学杰
|
c974cf1450
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
d273159e3e
|
1. 增加目的质量状态（规则表）
|
6 years ago |
wei.peng
|
61b0dfdc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
cb5eb56fe4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
5d1e6e8474
|
VDA收货 库位推荐入库规则
|
6 years ago |
|
刘敏
|
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 |