Commit Graph

83 Commits

Author SHA1 Message Date
db85a7025d 新增code字段 2023-12-28 09:28:44 +08:00
c1104b6443 m 2023-12-26 16:56:15 +08:00
db6a0a7739 新增场景产品等级 料号颜色解析 2023-12-25 16:56:55 +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
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
d366d7d922 commit for pull 2023-04-04 10:49:05 +08:00
caixiang
18c1c6cc15 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-04-03 10:59:41 +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
a436683e00 slot排序 2023-03-31 10:27:55 +08:00
abdcb07492 装箱单信息查询分页 2023-03-28 09:30:07 +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
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
8d37c0ebf9 报表导出格式 2023-03-21 15:10:40 +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
ba30dfe7af 报表查询 2023-03-16 09:55:43 +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
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
53a6f02212 手动装箱模组判空 时间倒序 2023-03-07 20:20:37 +08:00
caixiang
c588346c69 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-07 13:47:32 +08:00
caixiang
391b52b23a commit for pull 2023-03-07 13:47:24 +08:00
6fe5b71e49 m 2023-03-07 12:12:37 +08:00
f3f08353ae 模组信息查询 2023-03-07 10:27:24 +08:00
caixiang
a16cd349cc Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-07 09:45:01 +08:00
caixiang
867aef5f50 新增功率档位 统计报表 2023-03-07 09:44:47 +08:00
ddc2343842 手动装箱更新 默认显示当天 2023-03-06 21:02:54 +08:00
4fd5498f1e 模组查询包装箱 时间 2023-03-06 17:03:01 +08:00
cd1bfc3287 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
 Conflicts:
	ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
2023-03-06 11:55:29 +08:00
bf0d6108a1 导出 2023-03-06 11:50:59 +08:00
caixiang
05684b5d2a 新增功率档位 统计报表 2023-03-06 11:24:16 +08:00
caixiang
9ccc971a38 mark 2023-03-04 13:57:07 +08:00
caixiang
ec1e5097f7 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-03 15:04:06 +08:00