Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev

src/main/java/com/baosight/hggp/hg/yx/domain/HGYX001A.java

@@ -36,6 +36,7 @@ public class HGYX001A extends DaoEPBase {
 	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
 	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
 	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
+	public static final String FIELD_SPEC_ID = "specId";    		/* 规格ID*/
 	public static final String FIELD_SPEC = "spec";    		/* 规格*/
 	public static final String FIELD_LENGTH = "length";    		/* 长*/
 	public static final String FIELD_WIDTH = "width";    		/* 宽*/
@@ -60,6 +61,7 @@ public class HGYX001A extends DaoEPBase {
 	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
 	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 存货编码*/
 	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 存货名称*/
+	public static final String COL_SPEC_ID = "SPEC_ID";    		/* 规格ID*/
 	public static final String COL_SPEC = "SPEC";    		/* 规格*/
 	public static final String COL_LENGTH = "LENGTH";    		/* 长*/
 	public static final String COL_WIDTH = "WIDTH";    		/* 宽*/
@@ -91,6 +93,7 @@ public class HGYX001A extends DaoEPBase {
 	private String inventType = " ";		/* 存货类型*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
+	private Long specId = new Long(0);		/* 规格ID*/
 	private String spec = " ";		/* 规格*/
 	private BigDecimal length = new BigDecimal("0");		/* 长*/
 	private BigDecimal width = new BigDecimal("0");		/* 宽*/
@@ -163,7 +166,11 @@ public class HGYX001A extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
 		eiColumn.setDescName("存货名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_SPEC_ID);
+		eiColumn.setDescName("规格ID");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_SPEC);
 		eiColumn.setDescName("规格");
 		eiMetadata.addMeta(eiColumn);
@@ -451,6 +458,15 @@ public class HGYX001A extends DaoEPBase {
 	public void setInventName(String inventName) {
 		this.inventName = inventName;
 	}
+	
+	public Long getSpecId() {
+		return specId;
+	}
+	
+	public void setSpecId(Long specId) {
+		this.specId = specId;
+	}
+	
 	/**
 	 * get the spec - 规格.
 	 * @return the spec
@@ -603,6 +619,7 @@ public class HGYX001A extends DaoEPBase {
 		setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
 		setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
 		setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_NAME)), inventName));
+		setSpecId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_SPEC_ID)), specId));
 		setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SPEC)), spec));
 		setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_LENGTH)), length));
 		setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WIDTH)), width));
@@ -635,6 +652,7 @@ public class HGYX001A extends DaoEPBase {
 		map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
 		map.put(FIELD_INVENT_CODE, StringUtils.toString(inventCode, eiMetadata.getMeta(FIELD_INVENT_CODE)));
 		map.put(FIELD_INVENT_NAME, StringUtils.toString(inventName, eiMetadata.getMeta(FIELD_INVENT_NAME)));
+		map.put(FIELD_SPEC_ID, StringUtils.toString(specId, eiMetadata.getMeta(FIELD_SPEC_ID)));
 		map.put(FIELD_SPEC, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_SPEC)));
 		map.put(FIELD_LENGTH, StringUtils.toString(length, eiMetadata.getMeta(FIELD_LENGTH)));
 		map.put(FIELD_WIDTH, StringUtils.toString(width, eiMetadata.getMeta(FIELD_WIDTH)));

src/main/java/com/baosight/hggp/hg/yx/domain/HGYX002A.java

@@ -36,6 +36,7 @@ public class HGYX002A extends DaoEPBase {
 	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
 	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
 	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
+	public static final String FIELD_SPEC_ID = "specId";    		/* 规格ID*/
 	public static final String FIELD_SPEC = "spec";    		/* 规格*/
 	public static final String FIELD_LENGTH = "length";    		/* 长*/
 	public static final String FIELD_WIDTH = "width";    		/* 宽*/
@@ -62,6 +63,7 @@ public class HGYX002A extends DaoEPBase {
 	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
 	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 存货编码*/
 	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 存货名称*/
+	public static final String COL_SPEC_ID = "SPEC_ID";    		/* 规格ID*/
 	public static final String COL_SPEC = "SPEC";    		/* 规格*/
 	public static final String COL_LENGTH = "LENGTH";    		/* 长*/
 	public static final String COL_WIDTH = "WIDTH";    		/* 宽*/
@@ -95,6 +97,7 @@ public class HGYX002A extends DaoEPBase {
 	private String inventType = " ";		/* 存货类型*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
+	private Long specId = new Long(0);		/* 规格ID*/
 	private String spec = " ";		/* 规格*/
 	private BigDecimal length = new BigDecimal("0");		/* 长*/
 	private BigDecimal width = new BigDecimal("0");		/* 宽*/
@@ -169,7 +172,11 @@ public class HGYX002A extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
 		eiColumn.setDescName("存货名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
+		eiColumn = new EiColumn(FIELD_SPEC_ID);
+		eiColumn.setDescName("规格ID");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_SPEC);
 		eiColumn.setDescName("规格");
 		eiMetadata.addMeta(eiColumn);
@@ -470,6 +477,15 @@ public class HGYX002A extends DaoEPBase {
 	public void setInventName(String inventName) {
 		this.inventName = inventName;
 	}
+	
+	public Long getSpecId() {
+		return specId;
+	}
+	
+	public void setSpecId(Long specId) {
+		this.specId = specId;
+	}
+	
 	/**
 	 * get the spec - 规格.
 	 * @return the spec
@@ -661,6 +677,7 @@ public class HGYX002A extends DaoEPBase {
 		setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
 		setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
 		setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_NAME)), inventName));
+		setSpecId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_SPEC_ID)), specId));
 		setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SPEC)), spec));
 		setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_LENGTH)), length));
 		setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WIDTH)), width));
@@ -695,6 +712,7 @@ public class HGYX002A extends DaoEPBase {
 		map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
 		map.put(FIELD_INVENT_CODE, StringUtils.toString(inventCode, eiMetadata.getMeta(FIELD_INVENT_CODE)));
 		map.put(FIELD_INVENT_NAME, StringUtils.toString(inventName, eiMetadata.getMeta(FIELD_INVENT_NAME)));
+		map.put(FIELD_SPEC_ID, StringUtils.toString(specId, eiMetadata.getMeta(FIELD_SPEC_ID)));
 		map.put(FIELD_SPEC, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_SPEC)));
 		map.put(FIELD_LENGTH, StringUtils.toString(length, eiMetadata.getMeta(FIELD_LENGTH)));
 		map.put(FIELD_WIDTH, StringUtils.toString(width, eiMetadata.getMeta(FIELD_WIDTH)));

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX002A.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-06-07 14:37:36
-   		Version :  1.0
-		schema : hggp
-		tableName : HGYX002A
-		 ID  BIGINT   NOT NULL   primarykey, 
-		 ACCOUNT_CODE  VARCHAR, 
-		 DEP_CODE  VARCHAR, 
-		 CREATED_BY  VARCHAR, 
-		 CREATED_NAME  VARCHAR, 
-		 CREATED_TIME  VARCHAR, 
-		 UPDATED_BY  VARCHAR, 
-		 UPDATED_NAME  VARCHAR, 
-		 UPDATED_TIME  VARCHAR, 
-		 DELETE_FLAG  TINYINT, 
-		 INVENT_RECORD_ID  BIGINT, 
-		 INVENT_TYPE  VARCHAR, 
-		 INVENT_CODE  VARCHAR   NOT NULL, 
-		 INVENT_NAME  VARCHAR   NOT NULL, 
-		 SPEC  VARCHAR, 
-		 LENGTH  DECIMAL, 
-		 WIDTH  DECIMAL, 
-		 THICK  DECIMAL, 
-		 QUANTITY  DECIMAL, 
-		 UNIT_WEIGHT  DECIMAL, 
-		 WEIGHT  DECIMAL, 
-		 RETURN_QUANTITY  DECIMAL, 
-		 RETURN_WEIGHT  DECIMAL, 
-		 PARENT_ID  BIGINT
-	-->
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
 <sqlMap namespace="HGYX002A">
 
-	<typeAlias alias="HGYX002A" type="com.baosight.hggp.hg.yx.domain.HGYX002A"/>
+    <typeAlias alias="HGYX002A" type="com.baosight.hggp.hg.yx.domain.HGYX002A"/>
 	<typeAlias alias="HashMap" type="java.util.HashMap"/>
-	<sql id="column">
-		ID	as "id",  <!-- ID -->
-		ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
-		DEP_CODE	as "depCode",  <!-- 部门编码 -->
-		CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
-		CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
-		CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
-		UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
-		UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
-		UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
-		DELETE_FLAG	as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
-		INVENT_RECORD_ID	as "inventRecordId",  <!-- 存货档案id -->
-		INVENT_TYPE	as "inventType",  <!-- 存货类型 -->
-		INVENT_CODE	as "inventCode",  <!-- 存货编码 -->
-		INVENT_NAME	as "inventName",  <!-- 存货名称 -->
-		SPEC	as "spec",  <!-- 规格 -->
-		LENGTH	as "length",  <!-- 长 -->
-		WIDTH	as "width",  <!-- 宽 -->
-		THICK	as "thick",  <!-- 厚 -->
-		QUANTITY	as "quantity",  <!-- 发货数量 -->
-		UNIT_WEIGHT	as "unitWeight",  <!-- 单重 -->
-		WEIGHT	as "weight",  <!-- 发货重量 -->
-		RETURN_QUANTITY	as "returnQuantity",  <!-- 退货数量 -->
-		RETURN_WEIGHT	as "returnWeight",  <!-- 退货重量 -->
-		PARENT_ID	as "parentId", <!-- 销售退货ID -->
-		INVENT_TYPE_DETAIL as "inventTypeDetail"
-	</sql>
+    <sql id="column">
+        ID as "id",  <!-- ID -->
+        ACCOUNT_CODE as "accountCode",  <!-- 企业编码 -->
+        DEP_CODE as "depCode",  <!-- 部门编码 -->
+        CREATED_BY as "createdBy",  <!-- 记录创建者 -->
+        CREATED_NAME as "createdName",  <!-- 记录创建名称 -->
+        CREATED_TIME as "createdTime",  <!-- 记录创建时间 -->
+        UPDATED_BY as "updatedBy",  <!-- 记录修改者 -->
+        UPDATED_NAME as "updatedName",  <!-- 记录修改名称 -->
+        UPDATED_TIME as "updatedTime",  <!-- 记录修改时间 -->
+        DELETE_FLAG as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
+        INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案id -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        SPEC_ID as "specId",  <!-- 规格ID -->
+        SPEC as "spec",  <!-- 规格 -->
+        LENGTH as "length",  <!-- 长 -->
+        WIDTH as "width",  <!-- 宽 -->
+        THICK as "thick",  <!-- 厚 -->
+        QUANTITY as "quantity",  <!-- 发货数量 -->
+        UNIT_WEIGHT as "unitWeight",  <!-- 单重 -->
+        WEIGHT as "weight",  <!-- 发货重量 -->
+        RETURN_QUANTITY as "returnQuantity",  <!-- 退货数量 -->
+        RETURN_WEIGHT as "returnWeight",  <!-- 退货重量 -->
+        PARENT_ID as "parentId", <!-- 销售退货ID -->
+        INVENT_TYPE_DETAIL as "inventTypeDetail"
+    </sql>
+
 	<sql id="condition">
 		<include refid="HGXSDataAuth.authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">
@@ -166,110 +139,39 @@
     <include refid="condition" />
 	</select>
 
-	<!--
-		<isNotEmpty prepend=" AND " property="id">
-			ID = #id#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="accountCode">
-			ACCOUNT_CODE = #accountCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="depCode">
-			DEP_CODE = #depCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdBy">
-			CREATED_BY = #createdBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdName">
-			CREATED_NAME = #createdName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdTime">
-			CREATED_TIME = #createdTime#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedBy">
-			UPDATED_BY = #updatedBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedName">
-			UPDATED_NAME = #updatedName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedTime">
-			UPDATED_TIME = #updatedTime#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="deleteFlag">
-			DELETE_FLAG = #deleteFlag#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventRecordId">
-			INVENT_RECORD_ID = #inventRecordId#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventType">
-			INVENT_TYPE = #inventType#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventCode">
-			INVENT_CODE = #inventCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventName">
-			INVENT_NAME = #inventName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="spec">
-			SPEC = #spec#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="length">
-			LENGTH = #length#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="width">
-			WIDTH = #width#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="thick">
-			THICK = #thick#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="quantity">
-			QUANTITY = #quantity#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="unitWeight">
-			UNIT_WEIGHT = #unitWeight#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="weight">
-			WEIGHT = #weight#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="returnQuantity">
-			RETURN_QUANTITY = #returnQuantity#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="returnWeight">
-			RETURN_WEIGHT = #returnWeight#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="parentId">
-			PARENT_ID = #parentId#
-		</isNotEmpty>
-	-->
-
 	<insert id="insert">
-		INSERT INTO ${hggpSchema}.HGYX002A (ID,  <!-- ID -->
-										ACCOUNT_CODE,  <!-- 企业编码 -->
-										DEP_CODE,  <!-- 部门编码 -->
-										CREATED_BY,  <!-- 记录创建者 -->
-										CREATED_NAME,  <!-- 记录创建名称 -->
-										CREATED_TIME,  <!-- 记录创建时间 -->
-										UPDATED_BY,  <!-- 记录修改者 -->
-										UPDATED_NAME,  <!-- 记录修改名称 -->
-										UPDATED_TIME,  <!-- 记录修改时间 -->
-										DELETE_FLAG,  <!-- 0-未删除，1-已删除 -->
-										INVENT_RECORD_ID,  <!-- 存货档案id -->
-										INVENT_TYPE,  <!-- 存货类型 -->
-										INVENT_CODE,  <!-- 存货编码 -->
-										INVENT_NAME,  <!-- 存货名称 -->
-										SPEC,  <!-- 规格 -->
-										LENGTH,  <!-- 长 -->
-										WIDTH,  <!-- 宽 -->
-										THICK,  <!-- 厚 -->
-										QUANTITY,  <!-- 发货数量 -->
-										UNIT_WEIGHT,  <!-- 单重 -->
-										WEIGHT,  <!-- 发货重量 -->
-										RETURN_QUANTITY,  <!-- 退货数量 -->
-										RETURN_WEIGHT,  <!-- 退货重量 -->
-										PARENT_ID,  <!-- 销售退货ID -->
-		INVENT_TYPE_DETAIL
-										)
-	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #spec#, #length#, #width#, #thick#, #quantity#, #unitWeight#, #weight#, #returnQuantity#, #returnWeight#, #parentId#,#inventTypeDetail#)
-	</insert>
+        INSERT INTO ${hggpSchema}.HGYX002A (ID,  <!-- ID -->
+        ACCOUNT_CODE,  <!-- 企业编码 -->
+        DEP_CODE,  <!-- 部门编码 -->
+        CREATED_BY,  <!-- 记录创建者 -->
+        CREATED_NAME,  <!-- 记录创建名称 -->
+        CREATED_TIME,  <!-- 记录创建时间 -->
+        UPDATED_BY,  <!-- 记录修改者 -->
+        UPDATED_NAME,  <!-- 记录修改名称 -->
+        UPDATED_TIME,  <!-- 记录修改时间 -->
+        DELETE_FLAG,  <!-- 0-未删除，1-已删除 -->
+        INVENT_RECORD_ID,  <!-- 存货档案id -->
+        INVENT_TYPE,  <!-- 存货类型 -->
+        INVENT_CODE,  <!-- 存货编码 -->
+        INVENT_NAME,  <!-- 存货名称 -->
+        SPEC_ID, <!-- 规格ID -->
+        SPEC,  <!-- 规格 -->
+        LENGTH,  <!-- 长 -->
+        WIDTH,  <!-- 宽 -->
+        THICK,  <!-- 厚 -->
+        QUANTITY,  <!-- 发货数量 -->
+        UNIT_WEIGHT,  <!-- 单重 -->
+        WEIGHT,  <!-- 发货重量 -->
+        RETURN_QUANTITY,  <!-- 退货数量 -->
+        RETURN_WEIGHT,  <!-- 退货重量 -->
+        PARENT_ID,  <!-- 销售退货ID -->
+        INVENT_TYPE_DETAIL
+        )
+        VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
+        #updatedTime#, #deleteFlag#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #specId#, #spec#, #length#,
+        #width#, #thick#, #quantity#, #unitWeight#, #weight#, #returnQuantity#, #returnWeight#,
+        #parentId#,#inventTypeDetail#)
+    </insert>
 
 	<delete id="delete">
 		DELETE FROM ${hggpSchema}.HGYX002A WHERE