Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、禅道bug#1517、#1521修复；2、新增 创建组织自动复制默认标签模板能力；

Browse Source
This commit is contained in:
gaoqr
2026-05-15 09:03:55 +08:00
parent bd67db98e4
commit 9b1a85afb5
11 changed files with 212 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java
+14 -14
View File
@@ -12,26 +12,26 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum LabelTemplateType {
/**
* 板材包裹
*/
PLATEPACKAGELABEL("platePackageLabel"),
// /**
// * 板材包裹
// */
// PLATEPACKAGELABEL("platePackageLabel"),
/**
* 物料
*/
MATERIALLABEL("materialLabel"),
/**
* 机台标签
*/
MACHINELABEL("machineLabel"),
/**
* 配件包裹标签
*/
PARTSPACKAGELABEL("partsPackageLabel"),
// /**
// * 机台标签
// */
// MACHINELABEL("machineLabel"),
//
// /**
// * 配件包裹标签
// */
// PARTSPACKAGELABEL("partsPackageLabel"),
//
/**
* 订单包裹标签
*/
cf-module-system/cf-module-system-api/src/test/java/com/cf/imes/module/system/enums/label/LabelTemplateTypeTest.java
+3 -4
View File
@@ -13,9 +13,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class LabelTemplateTypeTest {
@Test
void test() {
assertEquals("platePackageLabel", LabelTemplateType.PLATEPACKAGELABEL.getType());
assertEquals("machineLabel", LabelTemplateType.MACHINELABEL.getType());
assertEquals("partsPackageLabel", LabelTemplateType.PARTSPACKAGELABEL.getType());
assertEquals("orderPackageLabel", LabelTemplateType.ORDERPACKAGELABEL.getType());
assertEquals("platePackageLabel", LabelTemplateType.ORDERPACKAGELABEL.getType());
assertEquals("materialLabel", LabelTemplateType.MATERIALLABEL.getType());
}
}