Commit Graph

14 Commits

Author SHA1 Message Date
ddc2343842 手动装箱更新 默认显示当天 2023-03-06 21:02:54 +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
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
caixiang
6d3b1e9cbb commit for pull 2023-02-24 08:46:36 +08:00
e8629b9ced fix 2023-02-23 18:51:03 +08:00
caixiang
384b1a3d54 Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4 2023-02-23 14:28:24 +08:00
caixiang
16f3cd5d30 commit for pull 2023-02-23 14:28:05 +08:00
5f409dfdf7 包装箱基板更新 2023-02-23 14:24:29 +08:00
caixiang
4d1a58b8c7 commit for pull 2023-02-22 20:48:15 +08:00
1d8aff98c7 包装 2023-02-22 15:59:13 +08:00