Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev

 Conflicts:
	src/main/java/com/baosight/hggp/core/security/UserSessionUtils.java

src/main/java/com/baosight/hggp/common/CompanyTypeEnum.java

@@ -24,12 +24,12 @@ public enum CompanyTypeEnum {
 		EiBlock block = new EiBlock("company_type_block_id");
 		List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{
 			add(new HashMap<String, Object>() {{
-				put(HPConstants.TEXT_FIELD, GQ.code + "-" + GQ.value);
-				put(HPConstants.VALUE_FIELD, GQ.code);
+				put(HGConstants.TEXT_FIELD, GQ.code + "-" + GQ.value);
+				put(HGConstants.VALUE_FIELD, GQ.code);
 			}});
 			add(new HashMap<String, Object>() {{
-				put(HPConstants.TEXT_FIELD, MY.code + "-" + MY.value);
-				put(HPConstants.VALUE_FIELD, MY.code);
+				put(HGConstants.TEXT_FIELD, MY.code + "-" + MY.value);
+				put(HGConstants.VALUE_FIELD, MY.code);
 			}});
 		}};
 		block.setRows(rows);

src/main/java/com/baosight/hggp/common/CustomerTypeEnum.java

@@ -44,12 +44,12 @@ public enum CustomerTypeEnum {
         EiBlock block = new EiBlock("customer_type_block_id");
         List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, SUPPLIER.code);
-                put(HPConstants.VALUE_FIELD, SUPPLIER.value);
+                put(HGConstants.TEXT_FIELD, SUPPLIER.code);
+                put(HGConstants.VALUE_FIELD, SUPPLIER.value);
             }});
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, CUSTOMER.code);
-                put(HPConstants.VALUE_FIELD, CUSTOMER.value);
+                put(HGConstants.TEXT_FIELD, CUSTOMER.code);
+                put(HGConstants.VALUE_FIELD, CUSTOMER.value);
             }});
         }};
         block.setRows(rows);

src/main/java/com/baosight/hggp/common/HPConstants.java → src/main/java/com/baosight/hggp/common/HGConstants.java

@@ -4,7 +4,7 @@ package com.baosight.hggp.common;
  * @author xuao
  * @date 2024年01月09日 14:53
  */
-public class HPConstants {
+public class HGConstants {
 
     /** 多字段拼接符号 XTC */
     public static final String BLOCK_DETAIL = "detail";

src/main/java/com/baosight/hggp/common/InitiateModeEnum.java

@@ -43,12 +43,12 @@ public enum InitiateModeEnum {
         EiBlock block = new EiBlock("initiate_mode_block_id");
         List<Map<String,Object>> rows = new ArrayList<Map<String,Object>>(){{
             add(new HashMap<String,Object>(){{
-                put(HPConstants.TEXT_FIELD,STOP.code);
-                put(HPConstants.VALUE_FIELD,STOP.value);
+                put(HGConstants.TEXT_FIELD,STOP.code);
+                put(HGConstants.VALUE_FIELD,STOP.value);
             }});
             add(new HashMap<String,Object>(){{
-                put(HPConstants.TEXT_FIELD,USING.code);
-                put(HPConstants.VALUE_FIELD,USING.value);
+                put(HGConstants.TEXT_FIELD,USING.code);
+                put(HGConstants.VALUE_FIELD,USING.value);
             }});
         }};
         block.setRows(rows);

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

@@ -67,20 +67,20 @@ public enum InventTypeEnum {
         EiBlock block = new EiBlock("customer_type_block_id");
         List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, MATERIAL.code + HPConstants.SPLICING_SYMBOL + MATERIAL.value);
-                put(HPConstants.VALUE_FIELD, MATERIAL.code);
+                put(HGConstants.TEXT_FIELD, MATERIAL.code + HGConstants.SPLICING_SYMBOL + MATERIAL.value);
+                put(HGConstants.VALUE_FIELD, MATERIAL.code);
             }});
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, CONSUMABLE.code + HPConstants.SPLICING_SYMBOL + CONSUMABLE.value);
-                put(HPConstants.VALUE_FIELD, CONSUMABLE.code);
+                put(HGConstants.TEXT_FIELD, CONSUMABLE.code + HGConstants.SPLICING_SYMBOL + CONSUMABLE.value);
+                put(HGConstants.VALUE_FIELD, CONSUMABLE.code);
             }});
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, SEMI_FINISHED_PRODUCT.code + HPConstants.SPLICING_SYMBOL + SEMI_FINISHED_PRODUCT.value);
-                put(HPConstants.VALUE_FIELD, SEMI_FINISHED_PRODUCT.code);
+                put(HGConstants.TEXT_FIELD, SEMI_FINISHED_PRODUCT.code + HGConstants.SPLICING_SYMBOL + SEMI_FINISHED_PRODUCT.value);
+                put(HGConstants.VALUE_FIELD, SEMI_FINISHED_PRODUCT.code);
             }});
             add(new HashMap<String, Object>() {{
-                put(HPConstants.TEXT_FIELD, FINISHED_PRODUCT.code + HPConstants.SPLICING_SYMBOL + FINISHED_PRODUCT.value);
-                put(HPConstants.VALUE_FIELD, FINISHED_PRODUCT.code);
+                put(HGConstants.TEXT_FIELD, FINISHED_PRODUCT.code + HGConstants.SPLICING_SYMBOL + FINISHED_PRODUCT.value);
+                put(HGConstants.VALUE_FIELD, FINISHED_PRODUCT.code);
             }});
         }};
         block.setRows(rows);

src/main/java/com/baosight/hggp/controller/LogInformationController.java

 package com.baosight.hggp.controller;
 
-import com.baosight.hggp.common.HPConstants;
-import com.baosight.hggp.equipment.hp.domain.CutterbarStatus;
-import com.baosight.hggp.equipment.hp.domain.CutterbarTime;
-import com.baosight.hggp.equipment.hp.domain.CutterbarWarning;
-import com.baosight.hggp.equipment.hp.domain.CutterbarWarningBase;
-import com.baosight.hggp.util.StringUtils;
-import com.baosight.hggp.xml.XmlUtils;
-import com.baosight.iplat4j.core.ei.EiConstant;
-import com.baosight.iplat4j.core.ei.EiInfo;
-import com.baosight.iplat4j.core.service.soa.XLocalManager;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 
 @RestController
 @CrossOrigin

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ008.xml

@@ -180,4 +180,17 @@
 			ID = #id#
 	</update>
 
+	<select id="queryComboBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		NAT_CODE as "natCode",
+		NAT_NAME as "natName"
+		FROM ${hggpSchema}.hppz008
+		WHERE DELETE_FLAG = 0
+		AND STATUS=1
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		ORDER BY NAT_CODE
+	</select>
 </sqlMap>