刘敏
|
809478be44
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
d8bc8d713d
|
条码打印model字段添加
|
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 |
 曾贞一
|
9e2169fa87
|
推荐入库 组件开发
|
6 years ago |
|
曾贞一
|
512ebb495c
|
VDA收货 提交组件
|
6 years ago |
|
曾贞一
|
f17c1d3d25
|
推荐入库 组件开发
|
6 years ago |
许心洁
|
787f12387d
|
流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理
|
6 years ago |
|
许心洁
|
de6792426e
|
流程管家：单据完成提交所有待提交移动单；只推送当前移动单
PDA收货组件：改数后删除历史记录BUG修复
|
6 years ago |
|
曾贞一
|
d509e5755a
|
vda 收货超收处理
|
6 years ago |
|
曾贞一
|
c5f43236a3
|
开口合同与po关系
|
6 years ago |
于学杰
|
05dc432c57
|
1. 增加关联单位和关联数量字段
|
6 years ago |
|
刘敏
|
72fec8146d
|
修改
|
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 |
陈思洁
|
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 |
|
许心洁
|
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 |
|
曾贞一
|
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 |
|
曾贞一
|
09aab6d87a
|
盘点添加 存储区多个查询
|
6 years ago |
|
曾贞一
|
a12a008713
|
盘点库位添加查询条件
|
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 |
|
刘敏
|
c05b22668f
|
字段修改
|
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 |
|
曾贞一
|
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 |
|
刘敏
|
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 |
|
许心洁
|
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 |
|
刘敏
|
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 |
|
刘敏
|
d484efb69e
|
明细构造新增
|
6 years ago |
|
陈思洁
|
b1dd7d3915
|
合并冲突
|
6 years ago |
|
陈思洁
|
d269576dbf
|
新增字段
|
6 years ago |
|
刘敏
|
ac1090d661
|
报表返回字段信息添加
|
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 |
|
许心洁
|
18dac2b569
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
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 |
|
陈思洁
|
18eff49e63
|
hql语句拼接修改
|
6 years ago |
|
陈思洁
|
11aff72404
|
新增冗余字段
|
6 years ago |
|
许心洁
|
3f5f89bd1b
|
流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）
|
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 |
|
许心洁
|
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 |
|
许心洁
|
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 |
|
刘敏
|
e09ad49fc9
|
物料新增结算供应商字段
|
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
|
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
|
739f12657e
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
07008f8e1b
|
实体修改
|
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
|
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
|
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
|
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 |
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 |