Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC005A.java

@@ -15,7 +15,7 @@ import com.baosight.iplat4j.core.util.StringUtils;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-05-17 17:03:29 create
+ * @history 2024-05-17 17:15:03 create
  */
 public class HGSC005A extends DaoEPBase {
 
@@ -95,7 +95,7 @@ public class HGSC005A extends DaoEPBase {
 	private Long techFlowId = new Long(0);	/* 工艺流程ID*/
 	private Long techFlowName = new Long(0);	/* 工艺流程名称*/
 	private Long inventProcessId = new Long(0);	/* 存货工序ID，对应HGPZ005A.id*/
-	private Long processName = new Long(0);	/* 工序名称*/
+	private String processName = " ";		/* 工序名称*/
 	private String companyCode = " ";		/* 公司编码*/
 	private String companyName = " ";		/* 公司名称*/
 	private String depCode = " ";		/* 部门编码*/
@@ -357,7 +357,7 @@ public class HGSC005A extends DaoEPBase {
 	 * get the processName - 工序名称.
 	 * @return the processName
 	 */
-	public Long getProcessName() {
+	public String getProcessName() {
 		return this.processName;
 	}
 
@@ -366,7 +366,7 @@ public class HGSC005A extends DaoEPBase {
 	 *
 	 * @param processName - 工序名称
 	 */
-	public void setProcessName(Long processName) {
+	public void setProcessName(String processName) {
 		this.processName = processName;
 	}
 	/**
@@ -751,7 +751,7 @@ public class HGSC005A extends DaoEPBase {
 		setTechFlowId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_tech_flow_id)), techFlowId));
 		setTechFlowName(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_tech_flow_name)), techFlowName));
 		setInventProcessId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_invent_process_id)), inventProcessId));
-		setProcessName(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_process_name)), processName));
+		setProcessName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_process_name)), processName));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_company_code)), companyCode));
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_company_name)), companyName));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_dep_code)), depCode));

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC005A.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
-		Generate time : 2024-05-17 17:03:29
+		Generate time : 2024-05-17 17:15:03
    		Version :  1.0
 		schema : hggp
 		tableName : HGSC005A
@@ -10,7 +10,7 @@
 		 tech_flow_id  BIGINT,
 		 tech_flow_name  BIGINT,
 		 invent_process_id  BIGINT,
-		 process_name  BIGINT,
+		 process_name  VARCHAR,
 		 company_code  VARCHAR   NOT NULL,
 		 company_name  VARCHAR   NOT NULL,
 		 dep_code  VARCHAR,

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -176,7 +176,7 @@ public class HGSCTools {
             hgpz005AList.forEach(pz -> {
                 HGSC005A obj = new HGSC005A();
                 BeanUtils.copyProperties(hgsc005a,obj);
-                obj.setProcessId(pz.getId());
+                obj.setInventProcessId(pz.getId());
                 obj.setProcessName(pz.getProcessName());
                 hgsc005AList.add(obj);
             });
@@ -193,7 +193,7 @@ public class HGSCTools {
             }
             List<HGSC005A> oldObjList = DaoBase.getInstance().query(HGSC005A.QUERY, paramMap);
             Map<Long,Optional<HGSC005A>> oldObjMap = Optional.ofNullable(oldObjList).orElse(new ArrayList<>()).stream()
-                    .collect(Collectors.groupingBy(HGSC005A::getProcessId,Collectors.maxBy(
+                    .collect(Collectors.groupingBy(HGSC005A::getInventProcessId,Collectors.maxBy(
                             Comparator.comparingInt(HGSC005A::getQuantity))));
             return oldObjMap;
         }
@@ -206,7 +206,7 @@ public class HGSCTools {
             List<HGSC005A> createList = new ArrayList<>();
             List<HGSC005A> updateList = new ArrayList<>();
             hgsc005AList.forEach(o -> {
-                Optional<HGSC005A> op = oldObjMap.get(o.getProcessId());
+                Optional<HGSC005A> op = oldObjMap.get(o.getInventProcessId());
                 if(Objects.nonNull(op)){
                     HGSC005A uo = op.get();
                     uo.setQuantity(uo.getQuantity()+o.getQuantity());
@@ -237,7 +237,7 @@ public class HGSCTools {
             List<HGSC005A> createList = new ArrayList<>();
             List<HGSC005A> updateList = new ArrayList<>();
             hgsc005AList.forEach(o -> {
-                Optional<HGSC005A> op = oldObjMap.get(o.getProcessId());
+                Optional<HGSC005A> op = oldObjMap.get(o.getInventProcessId());
                 if(Objects.nonNull(op)){
                     HGSC005A uo = op.get();
                     uo.setQuantity(o.getQuantity());