Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev

src/main/java/com/baosight/hpjx/common/InventTypeEnum.java

@@ -9,12 +9,13 @@ import java.util.*;
  * @Date 2024/1/10 14:29
  */
 public enum InventTypeEnum {
-    MATERIAL(1,"原材料"),
+    RAW(1,"原料"),
     CONSUMABLE(2,"耗材"),
     SEMI_FINISHED_PRODUCT(3,"零部件"),
     FINISHED_PRODUCT(4,"部件"),
 	WASTE(5,"废料"),
-	OTHER(6,"其他");
+	OTHER(6,"其他"),
+    MATERIAL(7,"材料");
 
     private Integer code;
 

src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI001.java

@@ -31,7 +31,7 @@ public class ServiceHPBI001 extends ServiceBase {
 
 
     // 指定存货类型
-    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
             InventTypeEnum.CONSUMABLE.getCode()};
 
     /**

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java

@@ -36,7 +36,7 @@ public class ServiceHPKC001 extends ServiceBase {
 
 
     // 指定存货类型
-    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
             InventTypeEnum.CONSUMABLE.getCode()};
 
     /**

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002.java

@@ -32,7 +32,7 @@ import java.util.Map;
 public class ServiceHPKC002 extends ServiceBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode()};
 	
 	/**

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002A.java

@@ -36,7 +36,7 @@ import java.util.Map;
 public class ServiceHPKC002A extends ServiceEPBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode()};
 	
 	/**

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004.java

@@ -31,7 +31,7 @@ import java.util.Map;
 public class ServiceHPKC004 extends ServiceBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.SEMI_FINISHED_PRODUCT.getCode(),
 			InventTypeEnum.FINISHED_PRODUCT.getCode()};
 	

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC006.java

@@ -38,7 +38,7 @@ import java.util.Map;
 public class ServiceHPKC006 extends ServiceBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.WASTE.getCode()};
 	
 	/**

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007.java

@@ -38,7 +38,7 @@ import java.util.Map;
 public class ServiceHPKC007 extends ServiceBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.WASTE.getCode()};
 	
 	/**

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007A.java

@@ -35,7 +35,7 @@ import java.util.Map;
 public class ServiceHPKC007A extends ServiceEPBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.WASTE.getCode()};
 	
 	/**