|
|
ed65364551
|
m
|
2023-12-28 15:42:36 +08:00 |
|
|
|
38ca9efa70
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-12-28 15:33:13 +08:00 |
|
|
|
cb7dc557b0
|
重复验证
|
2023-12-28 15:33:05 +08:00 |
|
|
|
33a90bc2ec
|
Merge pull request 'yanyang' (#35) from yanyang into master
Reviewed-on: #35
|
2023-12-28 09:29:33 +08:00 |
|
|
|
a84df8d493
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-12-28 09:28:53 +08:00 |
|
|
|
db85a7025d
|
新增code字段
|
2023-12-28 09:28:44 +08:00 |
|
|
|
374d6aba5a
|
Merge pull request 'yanyang' (#34) from yanyang into master
Reviewed-on: #34
|
2023-12-26 16:57:20 +08:00 |
|
|
|
81ec2cd27a
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-12-26 16:56:40 +08:00 |
|
|
|
c1104b6443
|
m
|
2023-12-26 16:56:15 +08:00 |
|
|
|
83707b5080
|
Merge pull request 'yanyang' (#33) from yanyang into master
Reviewed-on: #33
|
2023-12-25 16:59:43 +08:00 |
|
|
|
c8735c6fa7
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-12-25 16:57:06 +08:00 |
|
|
|
db6a0a7739
|
新增场景产品等级 料号颜色解析
|
2023-12-25 16:56:55 +08:00 |
|
|
|
8aea3bcd31
|
Merge pull request 'yanyang' (#32) from yanyang into master
Reviewed-on: #32
|
2023-12-20 15:09:14 +08:00 |
|
|
|
558e106f17
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
Conflicts:
ym-packing/src/main/java/com/cnbm/dispatch/line2/KukaEvent1ThreadLine2.java
|
2023-12-20 15:04:18 +08:00 |
|
|
|
259970a317
|
装箱单信息查询排序
|
2023-12-20 15:03:52 +08:00 |
|
caixiang
|
df116253ff
|
新增
|
2023-12-20 14:49:42 +08:00 |
|
caixiang
|
11b41b18f1
|
新增1线，是从2线平移过去的。
|
2023-10-26 09:11:22 +08:00 |
|
caixiang
|
4e10024bc8
|
新增1线，是从2线平移过去的。
|
2023-10-24 14:35:28 +08:00 |
|
caixiang
|
22115af70c
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
# Conflicts:
# ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
|
2023-08-18 14:23:34 +08:00 |
|
caixiang
|
1704b2c37b
|
优化日志，方便后续分析
|
2023-08-18 14:22:53 +08:00 |
|
caixiangc
|
9f78bbe8c3
|
mark
|
2023-07-01 20:29:03 +08:00 |
|
caixiang
|
72aae5c439
|
commit for pull
|
2023-05-12 16:21:41 +08:00 |
|
caixiang
|
d70f19adcd
|
commit for pull
|
2023-04-06 15:26:01 +08:00 |
|
caixiang
|
d366d7d922
|
commit for pull
|
2023-04-04 10:49:05 +08:00 |
|
caixiang
|
cabed052a1
|
commit for pull
|
2023-04-03 11:13:18 +08:00 |
|
caixiang
|
18c1c6cc15
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
2023-04-03 10:59:41 +08:00 |
|
caixiang
|
0e95d8c1d2
|
commit for pull
|
2023-04-03 10:59:34 +08:00 |
|
|
|
b0e88370b1
|
Merge pull request 'yanyang' (#31) from yanyang into master
Reviewed-on: #31
|
2023-04-03 10:41:32 +08:00 |
|
|
|
cbc3983714
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-04-03 10:40:43 +08:00 |
|
|
|
0eb650ff50
|
装箱单信息查询排序
|
2023-04-03 10:40:27 +08:00 |
|
caixiang
|
3ff7d7c178
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
2023-03-31 10:31:28 +08:00 |
|
caixiang
|
e82bc1161c
|
mark for pull
|
2023-03-31 10:31:20 +08:00 |
|
|
|
3172934f4e
|
Merge pull request 'yanyang' (#30) from yanyang into master
Reviewed-on: #30
|
2023-03-31 10:28:45 +08:00 |
|
|
|
802a5474e7
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-03-31 10:28:04 +08:00 |
|
|
|
a436683e00
|
slot排序
|
2023-03-31 10:27:55 +08:00 |
|
|
|
3ab40e515a
|
Merge pull request '装箱单信息查询分页' (#29) from yanyang into master
Reviewed-on: #29
|
2023-03-28 09:31:09 +08:00 |
|
|
|
abdcb07492
|
装箱单信息查询分页
|
2023-03-28 09:30:07 +08:00 |
|
caixiang
|
ce46bafa60
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
2023-03-24 11:54:49 +08:00 |
|
caixiang
|
9bce971af0
|
commit
|
2023-03-24 11:54:31 +08:00 |
|
|
|
045688f123
|
Merge pull request 'yanyang' (#28) from yanyang into master
Reviewed-on: #28
|
2023-03-24 11:21:38 +08:00 |
|
|
|
f02aa38051
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-03-24 11:20:52 +08:00 |
|
|
|
7694dd8242
|
用户管理 创建时间
|
2023-03-24 11:20:42 +08:00 |
|
|
|
64baad1a36
|
Merge pull request 'yanyang' (#27) from yanyang into master
Reviewed-on: #27
|
2023-03-23 17:17:53 +08:00 |
|
|
|
b6e61961f7
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-03-23 16:48:37 +08:00 |
|
|
|
42f4f2e741
|
包装箱名验证
|
2023-03-23 16:48:09 +08:00 |
|
caixiang
|
4e02f7e03a
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
2023-03-22 14:12:46 +08:00 |
|
caixiang
|
7789d2b1ab
|
commit
|
2023-03-22 14:12:37 +08:00 |
|
|
|
d62c7bf447
|
Merge pull request 'yanyang' (#26) from yanyang into master
Reviewed-on: #26
|
2023-03-22 14:10:49 +08:00 |
|
|
|
7970efd5d0
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-03-22 14:10:19 +08:00 |
|
|
|
dde937a6cd
|
创建时间倒序
|
2023-03-22 14:10:00 +08:00 |
|
