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 |
|
|
|
333d076f6e
|
实际功率字段
|
2023-03-03 15:02:10 +08:00 |
|
caixiang
|
e04a4d184e
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
2023-03-03 14:33:26 +08:00 |
|
caixiang
|
6d88aacee0
|
commit
|
2023-03-03 14:33:18 +08:00 |
|
|
|
2e72fb7df8
|
BaseSupportUtils
|
2023-03-03 09:51:54 +08:00 |
|
|
|
8fa7a486fd
|
m
|
2023-03-02 20:05:41 +08:00 |
|
|
|
df44cf308f
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-03-02 13:23:05 +08:00 |
|
|
|
57b79b4f0e
|
f
|
2023-03-02 13:22:49 +08:00 |
|
caixiang
|
550a2f796b
|
commit
|
2023-03-01 17:06:24 +08:00 |
|
caixiang
|
41207394e5
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
2023-03-01 12:05:27 +08:00 |
|
|
|
8c0e43d9f7
|
fix
|
2023-02-28 10:19:12 +08:00 |
|
|
|
56b8b82fc2
|
手动装箱打印新增返回
|
2023-02-28 09:26:43 +08:00 |
|
caixiang
|
31bc287207
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
|
2023-02-27 15:50:04 +08:00 |
|
caixiang
|
bb8986c98d
|
mark
|
2023-02-27 15:49:58 +08:00 |
|
|
|
94a7b76157
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
|
2023-02-27 10:58:19 +08:00 |
|
|
|
74dd845b13
|
m
|
2023-02-27 10:57:48 +08:00 |
|
|
|
58adaa3c59
|
打印查询
|
2023-02-27 10:54:22 +08:00 |
|
caixiang
|
fed8f82ff0
|
mark
|
2023-02-25 14:19:33 +08:00 |
|
caixiang
|
cdc06bd733
|
mark
|
2023-02-24 14:21:25 +08:00 |
|
caixiang
|
a50849affc
|
mark
|
2023-02-24 09:11:23 +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
|
1ebe39b60a
|
Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4
# Conflicts:
# ym-packing/pom.xml
|
2023-02-22 20:49:04 +08:00 |
|
caixiang
|
4d1a58b8c7
|
commit for pull
|
2023-02-22 20:48:15 +08:00 |
|
|
|
7a6fffbf21
|
class字段
|
2023-02-22 20:45:54 +08:00 |
|
|
|
d518ce3d19
|
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
Conflicts:
ym-packing/pom.xml
|
2023-02-22 16:14:54 +08:00 |
|
|
|
ff4bfe3a8b
|
m
|
2023-02-22 16:13:08 +08:00 |
|
|
|
1d8aff98c7
|
包装
|
2023-02-22 15:59:13 +08:00 |
|
caixiang
|
91c9602fb7
|
initial
|
2023-02-15 14:06:31 +08:00 |
|
caixiang
|
9d75942afb
|
initial
|
2023-02-14 09:08:21 +08:00 |
|
