 闫阳
|
6bce644663
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
7 月之前 |
|
闫阳
|
c6602d6099
|
装箱单导出字段
|
7 月之前 |
|
闫阳
|
c90631c205
|
Merge pull request '字段变更' (#38) from yanyang into master
Reviewed-on: #38
|
7 月之前 |
|
闫阳
|
c8aad62eb4
|
字段变更
|
7 月之前 |
|
闫阳
|
8c3d387257
|
Merge pull request 'm' (#37) from yanyang into master
Reviewed-on: #37
|
8 月之前 |
|
闫阳
|
ed65364551
|
m
|
8 月之前 |
|
闫阳
|
ffc28af175
|
Merge pull request 'yanyang' (#36) from yanyang into master
Reviewed-on: #36
|
8 月之前 |
|
闫阳
|
38ca9efa70
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
8 月之前 |
|
闫阳
|
cb7dc557b0
|
重复验证
|
8 月之前 |
|
闫阳
|
33a90bc2ec
|
Merge pull request 'yanyang' (#35) from yanyang into master
Reviewed-on: #35
|
8 月之前 |
|
闫阳
|
a84df8d493
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
8 月之前 |
|
闫阳
|
db85a7025d
|
新增code字段
|
8 月之前 |
|
闫阳
|
374d6aba5a
|
Merge pull request 'yanyang' (#34) from yanyang into master
Reviewed-on: #34
|
8 月之前 |
|
闫阳
|
81ec2cd27a
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
8 月之前 |
|
闫阳
|
c1104b6443
|
m
|
8 月之前 |
|
闫阳
|
83707b5080
|
Merge pull request 'yanyang' (#33) from yanyang into master
Reviewed-on: #33
|
8 月之前 |
|
闫阳
|
c8735c6fa7
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
8 月之前 |
|
闫阳
|
db6a0a7739
|
新增场景产品等级 料号颜色解析
|
8 月之前 |
|
闫阳
|
8aea3bcd31
|
Merge pull request 'yanyang' (#32) from yanyang into master
Reviewed-on: #32
|
9 月之前 |
|
闫阳
|
558e106f17
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
Conflicts:
ym-packing/src/main/java/com/cnbm/dispatch/line2/KukaEvent1ThreadLine2.java
|
9 月之前 |
|
闫阳
|
259970a317
|
装箱单信息查询排序
|
9 月之前 |
 caixiang
|
df116253ff
|
新增
|
9 月之前 |
|
caixiang
|
11b41b18f1
|
新增1线，是从2线平移过去的。
|
11 月之前 |
|
caixiang
|
4e10024bc8
|
新增1线，是从2线平移过去的。
|
11 月之前 |
|
caixiang
|
22115af70c
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
# Conflicts:
# ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
|
1 年之前 |
|
caixiang
|
1704b2c37b
|
优化日志，方便后续分析
|
1 年之前 |
|
caixiangc
|
9f78bbe8c3
|
mark
|
1 年之前 |
|
caixiang
|
72aae5c439
|
commit for pull
|
1 年之前 |
|
caixiang
|
d70f19adcd
|
commit for pull
|
1 年之前 |
|
caixiang
|
d366d7d922
|
commit for pull
|
1 年之前 |
|
caixiang
|
cabed052a1
|
commit for pull
|
1 年之前 |
|
caixiang
|
18c1c6cc15
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
1 年之前 |
|
caixiang
|
0e95d8c1d2
|
commit for pull
|
1 年之前 |
|
闫阳
|
b0e88370b1
|
Merge pull request 'yanyang' (#31) from yanyang into master
Reviewed-on: #31
|
1 年之前 |
|
闫阳
|
cbc3983714
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
1 年之前 |
|
闫阳
|
0eb650ff50
|
装箱单信息查询排序
|
1 年之前 |
|
caixiang
|
3ff7d7c178
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
1 年之前 |
|
caixiang
|
e82bc1161c
|
mark for pull
|
1 年之前 |
|
闫阳
|
3172934f4e
|
Merge pull request 'yanyang' (#30) from yanyang into master
Reviewed-on: #30
|
1 年之前 |
|
闫阳
|
802a5474e7
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
1 年之前 |
|
闫阳
|
a436683e00
|
slot排序
|
1 年之前 |
|
闫阳
|
3ab40e515a
|
Merge pull request '装箱单信息查询分页' (#29) from yanyang into master
Reviewed-on: #29
|
1 年之前 |
|
闫阳
|
abdcb07492
|
装箱单信息查询分页
|
1 年之前 |
|
caixiang
|
ce46bafa60
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
1 年之前 |
|
caixiang
|
9bce971af0
|
commit
|
1 年之前 |
|
闫阳
|
045688f123
|
Merge pull request 'yanyang' (#28) from yanyang into master
Reviewed-on: #28
|
1 年之前 |
|
闫阳
|
f02aa38051
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
1 年之前 |
|
闫阳
|
7694dd8242
|
用户管理 创建时间
|
1 年之前 |
|
闫阳
|
64baad1a36
|
Merge pull request 'yanyang' (#27) from yanyang into master
Reviewed-on: #27
|
1 年之前 |
|
闫阳
|
b6e61961f7
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
1 年之前 |
