许心洁
|
04453aa706
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
gaochangjiang
|
d0165fd342
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
陈思洁
|
2414993cf9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
777060450e
|
新增字段--目标库位
|
6 years ago |
gaochangjiang
|
047b9d5e35
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
gaochangjiang
|
02e3ac4960
|
【库存预警】bug 修复库存预警
|
6 years ago |
王杰
|
2417b40635
|
Merge branch 'dev' into test
|
6 years ago |
于学杰
|
80c340308a
|
1. 修改通用接口POJO中的字段长度
|
6 years ago |
许心洁
|
c9f26c22c1
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
bbec6a1002
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
许心洁
|
b112bdb5e8
|
成功处理移动单写入MOVE_TO_ERP表:根据移动单号+行号+零件号查询是否已存在数据,是则将此数据标记为不同步且无效软删除
|
6 years ago |
王杰
|
9446a76159
|
Merge branch 'dev' into test
|
6 years ago |
曾贞一
|
1357dfad30
|
【VDA收货-- 前端PC端POsn页】任务号1102
【VDA收货-- 问题清单中加密库位】任务号1104
【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112
【VDA收货-- 对于分组数据如何查看分组信息】任务号1111
|
6 years ago |
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
许心洁
|
dd86ce354a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
许心洁
|
b8842edbb1
|
无条码打印:新功能开发完成
|
6 years ago |
crish
|
88af19f8e9
|
修改开发环境pom文件test为dev
|
6 years ago |
changjiang.gao
|
13066bd4d1
|
【库存预警】bug 243
|
6 years ago |
crish
|
18161e8191
|
Merge branch 'test'
|
6 years ago |
许心洁
|
3bc277178e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
a90aa8498f
|
实体修改字段类型【int】改成【Integer】
|
6 years ago |
许心洁
|
0c20a2b655
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
e5b5891d23
|
bom信息中新增冗余字符
|
6 years ago |
许心洁
|
f5a8e9f130
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
曾贞一
|
610a96d2ee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
曾贞一
|
6b9c7b3ced
|
【VDA库存调整盘点】 添加供应商字段
|
6 years ago |
许心洁
|
77fefbcf74
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
04df70114d
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
e593cc875d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
changjiang.gao
|
2ba7596a57
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
changjiang.gao
|
25f11781c1
|
盘点差异增加字段
|
6 years ago |
许心洁
|
ba7fe81978
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
许心洁
|
5956d5a08e
|
冲销:需求变更优化
|
6 years ago |
曾贞一
|
26b4a5c52c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
曾贞一
|
a9045ed403
|
bug 5953
|
6 years ago |
陈思洁
|
a54d711d95
|
#1085 BOM导入接口新增
|
6 years ago |
crish
|
15e812c7a6
|
Merge branch 'test'
|
6 years ago |
许心洁
|
02055a8b7e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
18789939b0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
crish
|
0526da8ee3
|
Merge branch 'test'
|
6 years ago |
crish
|
cd74f5336f
|
Merge branch 'dev' into test
|
6 years ago |
于学杰
|
dbc69e957a
|
1. 供应商物料实体增加字段
|
6 years ago |
刘辉
|
e89df89f9a
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
changjiang.gao
|
3ab8cf112d
|
盘点条码差异
|
6 years ago |
刘辉
|
febbea09c3
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
changjiang.gao
|
8808a77de6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
changjiang.gao
|
69e8357c69
|
条码数量编辑
|
6 years ago |
于学杰
|
63e225026c
|
1. 扩展通用接口功能,支持与软适配的对接
|
6 years ago |
刘辉
|
4ffc63ce83
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
bleakney.liu
|
f6be80db01
|
增加groupby 构造函数
|
6 years ago |
许心洁
|
a1597c089c
|
成品冲销+导入转换格式(就一个不知道是什么单导入)
|
6 years ago |
crish
|
1de89d732b
|
本地误拉了test代码,解决pom
|
6 years ago |
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
曾贞一
|
e603ac66a7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
许心洁
|
16839f6911
|
成品冲销+抛异常方法封装优化
|
6 years ago |
许心洁
|
2f843a8f5a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
88754f9a71
|
收货看板重写
|
6 years ago |
于学杰
|
68a6c85068
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
cd8bd3a68b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
3828b4863c
|
添加保质期字段
|
6 years ago |
曾贞一
|
dfdb6be4bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
曾贞一
|
6a9924eda6
|
【VDA生产领料】 FIFO推荐组件
|
6 years ago |
wei.peng
|
e7e4a8587f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
于学杰
|
fcefe8de38
|
1. 通用接口增加调用软适配的功能(使用脚本引擎实现)
|
6 years ago |
许心洁
|
7863325afd
|
本地误拉了测试的代码,还原后提交,在测试分支拉开发分支的代码也得还原
|
6 years ago |
许心洁
|
b7b78b85ac
|
误拉了test分支的代码:还原
|
6 years ago |
刘辉
|
83a7a9e988
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
changjiang.gao
|
9e1b86eb2b
|
导出显示bug修改
|
6 years ago |
许心洁
|
8deff73454
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
changjiang.gao
|
647508d92c
|
导出显示bug修改
|
6 years ago |
刘辉
|
722146acd8
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
bleakney.liu
|
29fee6b028
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
bleakney.liu
|
746a04f96d
|
代码格式优化
|
6 years ago |
许心洁
|
6fc4474699
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lbwgithub
|
a4d873f36f
|
添加过滤条件
|
6 years ago |
crish
|
672438f2c0
|
Merge branch 'test'
|
6 years ago |
许心洁
|
04cdf58aef
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lbwgithub
|
abd2321850
|
格式化代码
|
6 years ago |
crish
|
0924810e64
|
Merge branch 'test'
|
6 years ago |
许心洁
|
89ab1816e3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lbwgithub
|
71a68e8cf6
|
枚举
|
6 years ago |
王杰
|
18bc35f60d
|
Merge branch 'dev' into test
|
6 years ago |
lbwgithub
|
473e2caea0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
lbwgithub
|
2cf4759c21
|
枚举
|
6 years ago |
刘辉
|
60d1798b9c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
0bdc3592e2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
f67e7df17f
|
新增冗余字段
|
6 years ago |
曾贞一
|
320c7f6b1f
|
【生产快速入库】生产快速入库导入接口
|
6 years ago |
许心洁
|
1e41ab2e39
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
曾贞一
|
9d3b45d2e2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
曾贞一
|
ddd91f51b5
|
【生产快速入库】组件选择,任务编号1051
|
6 years ago |
许心洁
|
232c675444
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
84a96a22fa
|
新加NotNumBiggerPackContainsZero方法
|
6 years ago |
许心洁
|
1b5df102e7
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
95f156adf4
|
所有double类型的属性都要加上精度注解,否则数据库中自动生成的类型为double
|
6 years ago |
许心洁
|
1a7b4e3438
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
刘辉
|
1defd0d8be
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
113bb8755d
|
解决冲突
|
6 years ago |
陈思洁
|
4ac7bae38b
|
新增hql
|
6 years ago |
bleakney.liu
|
0fa1ffa23b
|
[物流线路修改]修改数据类型
|
6 years ago |
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 |