Commit Graph

11 Commits

Author SHA1 Message Date
4e932a09fd 手动装箱编辑判定 2023-03-08 10:42:33 +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
56b8b82fc2 手动装箱打印新增返回 2023-02-28 09:26:43 +08:00
caixiang
161b5b5be4 Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4
# Conflicts:
#	ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
#	ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
#	ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
2023-02-24 08:47:56 +08:00
e8629b9ced fix 2023-02-23 18:51:03 +08:00
caixiang
16f3cd5d30 commit for pull 2023-02-23 14:28:05 +08:00
1d8aff98c7 包装 2023-02-22 15:59:13 +08:00