20a3675
(HEAD -> master)
Merge pull request 'yanyang' (#41) from yanyang into master by
2024-02-05 11:24:29 +0800
46f51e6
(refs/pull/41/head, yanyang)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2024-02-05 11:23:50 +0800
e950cbb
重复上片基板去重排序 by
2024-02-05 11:23:41 +0800
f9af03b
Merge pull request 'yanyang' (#40) from yanyang into master by
2024-02-05 10:53:45 +0800
095bdc1
(refs/pull/40/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2024-02-05 10:53:01 +0800
fd4c383
重复上片基板去重 by
2024-02-05 10:52:51 +0800
e5128e3
Merge pull request 'yanyang' (#39) from yanyang into master by
2024-02-02 14:45:23 +0800
6bce644
(refs/pull/39/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2024-02-02 14:44:10 +0800
c6602d6
装箱单导出字段 by
2024-02-02 14:43:57 +0800
c90631c
Merge pull request '字段变更' (#38) from yanyang into master by
2024-01-30 09:43:57 +0800
c8aad62
(refs/pull/38/head)
字段变更 by
2024-01-30 09:42:37 +0800
8c3d387
Merge pull request 'm' (#37) from yanyang into master by
2023-12-28 15:44:48 +0800
ed65364
(refs/pull/37/head)
m by
2023-12-28 15:42:36 +0800
ffc28af
Merge pull request 'yanyang' (#36) from yanyang into master by
2023-12-28 15:34:13 +0800
38ca9ef
(refs/pull/36/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-12-28 15:33:13 +0800
cb7dc55
重复验证 by
2023-12-28 15:33:05 +0800
33a90bc
Merge pull request 'yanyang' (#35) from yanyang into master by
2023-12-28 09:29:33 +0800
a84df8d
(refs/pull/35/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-12-28 09:28:53 +0800
db85a70
新增code字段 by
2023-12-28 09:28:44 +0800
374d6ab
Merge pull request 'yanyang' (#34) from yanyang into master by
2023-12-26 16:57:20 +0800
81ec2cd
(refs/pull/34/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-12-26 16:56:40 +0800
c1104b6
m by
2023-12-26 16:56:15 +0800
83707b5
Merge pull request 'yanyang' (#33) from yanyang into master by
2023-12-25 16:59:43 +0800
c8735c6
(refs/pull/33/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-12-25 16:57:06 +0800
db6a0a7
新增场景产品等级 料号颜色解析 by
2023-12-25 16:56:55 +0800
8aea3bc
Merge pull request 'yanyang' (#32) from yanyang into master by
2023-12-20 15:09:14 +0800
558e106
(refs/pull/32/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-12-20 15:04:18 +0800
259970a
装箱单信息查询排序 by
2023-12-20 15:03:52 +0800
df11625
新增 by
2023-12-20 14:49:42 +0800
11b41b1
新增1线,是从2线平移过去的。 by
2023-10-26 09:11:22 +0800
4e10024
新增1线,是从2线平移过去的。 by
2023-10-24 14:35:28 +0800
22115af
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-08-18 14:23:34 +0800
1704b2c
优化日志,方便后续分析 by
2023-08-18 14:22:53 +0800
9f78bbe
mark by
2023-07-01 20:29:03 +0800
72aae5c
commit for pull by
2023-05-12 16:21:41 +0800
d70f19a
commit for pull by
2023-04-06 15:26:01 +0800
d366d7d
commit for pull by
2023-04-04 10:49:05 +0800
cabed05
commit for pull by
2023-04-03 11:13:18 +0800
18c1c6c
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-04-03 10:59:41 +0800
0e95d8c
commit for pull by
2023-04-03 10:59:34 +0800
b0e8837
Merge pull request 'yanyang' (#31) from yanyang into master by
2023-04-03 10:41:32 +0800
cbc3983
(refs/pull/31/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-04-03 10:40:43 +0800
0eb650f
装箱单信息查询排序 by
2023-04-03 10:40:27 +0800
3ff7d7c
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-31 10:31:28 +0800
e82bc11
mark for pull by
2023-03-31 10:31:20 +0800
3172934
Merge pull request 'yanyang' (#30) from yanyang into master by
2023-03-31 10:28:45 +0800
802a547
(refs/pull/30/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-31 10:28:04 +0800
a436683
slot排序 by
2023-03-31 10:27:55 +0800
3ab40e5
Merge pull request '装箱单信息查询分页' (#29) from yanyang into master by
2023-03-28 09:31:09 +0800
abdcb07
(refs/pull/29/head)
装箱单信息查询分页 by
2023-03-28 09:30:07 +0800
ce46baf
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-24 11:54:49 +0800
9bce971
commit by
2023-03-24 11:54:31 +0800
045688f
Merge pull request 'yanyang' (#28) from yanyang into master by
2023-03-24 11:21:38 +0800
f02aa38
(refs/pull/28/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-24 11:20:52 +0800
7694dd8
用户管理 创建时间 by
2023-03-24 11:20:42 +0800
64baad1
Merge pull request 'yanyang' (#27) from yanyang into master by
2023-03-23 17:17:53 +0800
b6e6196
(refs/pull/27/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-23 16:48:37 +0800
42f4f2e
包装箱名验证 by
2023-03-23 16:48:09 +0800
4e02f7e
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-22 14:12:46 +0800
7789d2b
commit by
2023-03-22 14:12:37 +0800
d62c7bf
Merge pull request 'yanyang' (#26) from yanyang into master by
2023-03-22 14:10:49 +0800
7970efd
(refs/pull/26/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-22 14:10:19 +0800
dde937a
创建时间倒序 by
2023-03-22 14:10:00 +0800
2b3c4b5
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-21 16:47:42 +0800
1258751
commit for pull by
2023-03-21 16:47:35 +0800
a7ae474
Merge pull request 'yanyang' (#25) from yanyang into master by
2023-03-21 15:12:14 +0800
f07fbd8
(refs/pull/25/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-21 15:10:49 +0800
8d37c0e
报表导出格式 by
2023-03-21 15:10:40 +0800
5173616
Merge pull request 'm' (#24) from yanyang into master by
2023-03-21 08:52:30 +0800
dcc726a
(refs/pull/24/head)
m by
2023-03-21 08:51:28 +0800
6f50adc
查询模组档位统计分布图 修改 by
2023-03-17 13:50:53 +0800
c37f25a
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-17 12:41:54 +0800
78c9cbd
查询模组档位统计分布图 修改 by
2023-03-17 12:39:56 +0800
eda15da
Merge pull request 'yanyang' (#23) from yanyang into master by
2023-03-16 09:56:31 +0800
02cecae
(refs/pull/23/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-16 09:55:51 +0800
ba30dfe
报表查询 by
2023-03-16 09:55:43 +0800
ee0bd67
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-08 13:03:21 +0800
4d8f2bf
commit for pull by
2023-03-08 13:03:13 +0800
6b38aeb
Merge pull request 'yanyang' (#22) from yanyang into master by
2023-03-08 11:55:50 +0800
5f5a60e
(refs/pull/22/head)
打印模板isEnable by
2023-03-08 11:30:02 +0800
1684075
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-08 10:43:29 +0800
4e932a0
手动装箱编辑判定 by
2023-03-08 10:42:33 +0800
fe10292
mark by
2023-03-08 09:39:36 +0800
c284a4b
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-07 21:58:11 +0800
00c907e
commit for pull by
2023-03-07 21:57:54 +0800
3b7cc67
Merge pull request 'yanyang' (#21) from yanyang into master by
2023-03-07 20:21:17 +0800
10c2414
(refs/pull/21/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-07 20:20:46 +0800
53a6f02
手动装箱模组判空 时间倒序 by
2023-03-07 20:20:37 +0800
c588346
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-07 13:47:32 +0800
391b52b
commit for pull by
2023-03-07 13:47:24 +0800
c9ddb77
Merge pull request 'm' (#20) from yanyang into master by
2023-03-07 12:12:58 +0800
6fe5b71
(refs/pull/20/head)
m by
2023-03-07 12:12:37 +0800
e35c2f4
Merge pull request 'yanyang' (#19) from yanyang into master by
2023-03-07 10:31:42 +0800
d8b1f7e
(refs/pull/19/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-07 10:27:33 +0800
f3f0835
模组信息查询 by
2023-03-07 10:27:24 +0800
a16cd34
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 by
2023-03-07 09:45:01 +0800
867aef5
新增功率档位 统计报表 by
2023-03-07 09:44:47 +0800
06364c9
Merge pull request 'yanyang' (#18) from yanyang into master by
2023-03-06 21:03:43 +0800
7aa7e38
(refs/pull/18/head)
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang by
2023-03-06 21:03:05 +0800
ddc2343
手动装箱更新 默认显示当天 by
2023-03-06 21:02:54 +0800