许心洁
|
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 |
|
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 |
|
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 |
|
jimmy.zeng
|
7e5d2e1e56
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
18eff49e63
|
hql语句拼接修改
|
6 years ago |
|
陈思洁
|
11aff72404
|
新增冗余字段
|
6 years ago |
|
jimmy.zeng
|
61822039c5
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
3f5f89bd1b
|
流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）
|
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 |
|
陈思洁
|
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 |
 曾贞一
|
acd1e6cfb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ce70994a57
|
盘点 按照盘点差异类型汇总
|
6 years ago |
|
陈思洁
|
4d00397411
|
修改盘点范围的排序规则
|
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 |
|
刘敏
|
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 |
|
陈思洁
|
e9c596adce
|
盘点hql排序修改
|
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 |
|
曾贞一
|
abf155ecd9
|
库存报表 创建人、创建时间添加
|
6 years ago |
|
刘敏
|
839c139222
|
库存移动条码报表优化
|
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 |
|
许心洁
|
a713e835fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ff52a412d4
|
库存初始化信息
|
6 years ago |
|
陈思洁
|
b604c5d9a0
|
交易记录增加字段
|
6 years ago |
|
许心洁
|
92d4bf46ce
|
#5255,#5039
|
6 years ago |
|
jimmy.zeng
|
bf293d4758
|
生产报工时，原材料move单号写入关联移动单号中
|
6 years ago |
|
刘敏
|
dacc203119
|
库存报表修改
|
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 |
|
于学杰
|
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
|
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
|
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
|
1fe05ab150
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c3fe273954
|
解决冲突
|
6 years ago |
|
许心洁
|
60e6d51d35
|
流程管家2.0
|
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 |