Commit Graph

19 Commits

Author SHA1 Message Date
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
e82bc1161c mark for pull 2023-03-31 10:31:20 +08:00
abdcb07492 装箱单信息查询分页 2023-03-28 09:30:07 +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
f3f08353ae 模组信息查询 2023-03-07 10:27:24 +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
333d076f6e 实际功率字段 2023-03-03 15:02:10 +08:00
caixiang
6d88aacee0 commit 2023-03-03 14:33:18 +08:00
caixiang
6d3b1e9cbb commit for pull 2023-02-24 08:46:36 +08:00
caixiang
16f3cd5d30 commit for pull 2023-02-23 14:28:05 +08:00
caixiang
4d1a58b8c7 commit for pull 2023-02-22 20:48:15 +08:00
1d8aff98c7 包装 2023-02-22 15:59:13 +08:00