Commit Graph

10 Commits

Author SHA1 Message Date
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
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
5f5a60eb29 打印模板isEnable 2023-03-08 11:30:02 +08:00
bf0d6108a1 导出 2023-03-06 11:50:59 +08:00
74dd845b13 m 2023-02-27 10:57:48 +08:00
5f409dfdf7 包装箱基板更新 2023-02-23 14:24:29 +08:00
7a6fffbf21 class字段 2023-02-22 20:45:54 +08:00
1d8aff98c7 包装 2023-02-22 15:59:13 +08:00