Commit Graph

219 Commits

Author SHA1 Message Date
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
caixiang
2b3c4b5f03 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-21 16:47:42 +08:00
caixiang
1258751c10 commit for pull 2023-03-21 16:47:35 +08:00
a7ae47485c Merge pull request 'yanyang' (#25) from yanyang into master
Reviewed-on: #25
2023-03-21 15:12:14 +08:00
f07fbd89a9 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-21 15:10:49 +08:00
8d37c0ebf9 报表导出格式 2023-03-21 15:10:40 +08:00
51736166a4 Merge pull request 'm' (#24) from yanyang into master
Reviewed-on: #24
2023-03-21 08:52:30 +08:00
dcc726ad77 m 2023-03-21 08:51:28 +08:00
caixiang
6f50adc782 查询模组档位统计分布图 修改 2023-03-17 13:50:53 +08:00
caixiang
c37f25a874 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
# Conflicts:
#	ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
#	ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java
2023-03-17 12:41:54 +08:00
caixiang
78c9cbd686 查询模组档位统计分布图 修改 2023-03-17 12:39:56 +08:00
eda15da1a9 Merge pull request 'yanyang' (#23) from yanyang into master
Reviewed-on: #23
2023-03-16 09:56:31 +08:00
02cecaed68 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-16 09:55:51 +08:00
ba30dfe7af 报表查询 2023-03-16 09:55:43 +08:00
caixiang
ee0bd67011 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-08 13:03:21 +08:00
caixiang
4d8f2bfe74 commit for pull 2023-03-08 13:03:13 +08:00
6b38aebb5b Merge pull request 'yanyang' (#22) from yanyang into master
Reviewed-on: #22
2023-03-08 11:55:50 +08:00
5f5a60eb29 打印模板isEnable 2023-03-08 11:30:02 +08:00
1684075a9c Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-08 10:43:29 +08:00
4e932a09fd 手动装箱编辑判定 2023-03-08 10:42:33 +08:00
caixiang
fe10292885 mark 2023-03-08 09:39:36 +08:00
caixiang
c284a4b394 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-07 21:58:11 +08:00
caixiang
00c907ece0 commit for pull 2023-03-07 21:57:54 +08:00