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

src/main/java/com/baosight/hpjx/core/dao/DaoUtils.java

@@ -38,6 +38,44 @@ public class DaoUtils {
 	}
 	
 	/**
+	 * 查询
+	 *
+	 * @param sql
+	 * @param obj
+	 * @return
+	 */
+	public static List query(String sql, Object obj){
+		if (obj instanceof DaoEPBase) {
+			// 企业编码
+			try {
+				String companyCode;
+				try {
+					companyCode = UserSessionUtils.getCompanyCode();
+				} catch (Exception e) {
+					companyCode = "";
+				}
+				BeanUtils.setProperty(obj, "companyCode", companyCode);
+			} catch (Exception e) {
+				log.warn("写入企业编码失败", e);
+			}
+		} else if (obj instanceof Map) {
+			// 创建人企业编码
+			try {
+				String companyCode;
+				try {
+					companyCode = UserSessionUtils.getCompanyCode();
+				} catch (Exception e) {
+					companyCode = "";
+				}
+				((Map) obj).put("companyCode", companyCode);
+			} catch (Exception e) {
+				log.warn("写入企业编码失败", e);
+			}
+		}
+		return  DaoBase.getInstance().query(sql, obj);
+	}
+	
+	/**
 	 * insert method.
 	 *
 	 * @param sql

src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java

@@ -13,7 +13,9 @@ public class HPConstant {
 	 * @date:2021/8/17,15:22
 	 */
 	public class SequenceId {
-
+		
+		// 企业编码
+		public static final String COMPANY_CODE = "COMPANY_CODE";
 		//项目档案编号
 		public static final String PROJ_NUMBER = "PROJ_NUMBER";
 		// 盘点单号

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

@@ -4,6 +4,7 @@ import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
+import com.baosight.hpjx.hp.constant.HPSqlConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC005;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.kc.domain.HPKC007;
@@ -55,7 +56,10 @@ public class ServiceHPKC005 extends ServiceBase {
 	}
 	
 	/**
-	 * 查询操作.
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
 	 */
 	@Override
 	public EiInfo query(EiInfo inInfo) {
@@ -64,8 +68,8 @@ public class ServiceHPKC005 extends ServiceBase {
 			String receiptDate = MapUtils.getString(queryRow, "receiptDate");
 			queryRow.put("receiptDate", StringUtil.removeSpecifiedCharacter(receiptDate,
 					StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
-			inInfo = super.query(inInfo, "HPKC005.query", new HPKC005());
-			List sum = dao.query("HPKC005.querySum", queryRow);
+			inInfo = super.query(inInfo, HPKC005.QUERY, new HPKC005());
+			List sum = dao.query(HPSqlConstant.HPKC005.QUERY_SUM, queryRow);
 			inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -74,75 +78,11 @@ public class ServiceHPKC005 extends ServiceBase {
 	}
 	
 	/**
-	 * 保存操作.
+	 * 新增操作
 	 *
 	 * @param inInfo
 	 * @return
 	 */
-	public EiInfo save(EiInfo inInfo) {
-		try {
-			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
-			// 数据校验
-			this.checkSaveData(resultRows);
-			// 写入数据
-			for (int i = 0; i < resultRows.size(); i++) {
-				HPKC005 fKc005 = new HPKC005();
-				fKc005.fromMap(resultRows.get(i));
-				// 设置基础信息
-				this.setBaseInfo(fKc005);
-				if (fKc005.getId() == null || fKc005.getId() == 0) {
-					this.add(fKc005);
-				} else {
-					this.modify(fKc005);
-				}
-			}
-			inInfo = this.query(inInfo);
-			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
-		} catch (Exception e) {
-			LogUtils.setDetailMsg(inInfo, e, "保存失败");
-		}
-		return inInfo;
-	}
-	
-	/**
-	 * 校验保存的数据
-	 *
-	 * @param resultRows
-	 */
-	private void checkSaveData(List<Map> resultRows) {
-		for (int i = 0; i < resultRows.size(); i++) {
-			HPKC005 fKc005 = new HPKC005();
-			fKc005.fromMap(resultRows.get(i));
-			AssertUtils.isEmpty(fKc005.getWhCode(), "仓库名称不能为空");
-			AssertUtils.isNull(fKc005.getInventCode(), "存货名称不能为空");
-		}
-	}
-	
-	/**
-	 * 新增
-	 *
-	 * @param fKc005
-	 */
-	private void add(HPKC005 fKc005) {
-		// 生成单据号
-		fKc005.setCheckNo(SequenceGenerator.getNextSequence(
-				HPConstant.SequenceId.CHECK_NO));
-		DaoUtils.insert("HPKC005.insert", fKc005);
-	}
-	
-	/**
-	 * 修改数据
-	 *
-	 * @param fKc005
-	 */
-	private void modify(HPKC005 fKc005) {
-		DaoUtils.update("HPKC005.update", fKc005);
-	}
-	
-	/**
-	 * 新增操作.
-	 */
 	@Override
 	public EiInfo insert(EiInfo inInfo) {
 		try {

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

@@ -26,7 +26,10 @@ import java.util.Map;
 public class ServiceHPKC008 extends ServiceBase {
 	
 	/**
-	 * 画面初始化.
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
@@ -37,21 +40,24 @@ public class ServiceHPKC008 extends ServiceBase {
 		}
 		return inInfo;
 	}
-
-    /**
-     * 查询操作.
-     */
-    @Override
-    public EiInfo query(EiInfo inInfo) {
-	    try {
-		    Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-		    String dateMonth = MapUtils.getString(queryRow, "dateMonth");
-		    queryRow.put("dateMonth", StringUtil.removeSpecifiedCharacter(dateMonth,
-				    StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
-		    inInfo = super.query(inInfo, "HPKC008.query", new HPKC008());
-		    List sum = dao.query("HPKC008.querySum", queryRow);
-		    inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
-	    } catch (Exception e) {
+	
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			String dateMonth = MapUtils.getString(queryRow, "dateMonth");
+			queryRow.put("dateMonth", StringUtil.removeSpecifiedCharacter(dateMonth,
+					StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
+			inInfo = super.query(inInfo, "HPKC008.query", new HPKC008());
+			List sum = dao.query("HPKC008.querySum", queryRow);
+			inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
+		} catch (Exception e) {
 		    LogUtils.setDetailMsg(inInfo, e, "查询失败");
 	    }
 	    return inInfo;
@@ -80,6 +86,8 @@ public class ServiceHPKC008 extends ServiceBase {
 						HPConstant.SequenceId.HPKC008_NUMBER));
 				DaoUtils.insert(HPKC008.INSERT, fKc008);
 			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "新增失败");

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

@@ -57,6 +57,8 @@ public class ServiceHPKC009 extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC009().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -78,7 +80,7 @@ public class ServiceHPKC009 extends ServiceBase {
 			queryRow.put("dateProc", StringUtil.removeSpecifiedCharacter(receiptDate,
 					StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
 			queryRow.put("dateType", CommonConstant.DateType.MONTH);
-			inInfo = super.query(inInfo, "HPKC009.query", new HPPZ009());
+			inInfo = super.query(inInfo, HPKC009.QUERY, new HPKC009());
 			List sum = dao.query("HPKC009.querySum", queryRow);
 			inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
 		} catch (Exception e) {
@@ -197,14 +199,14 @@ public class ServiceHPKC009 extends ServiceBase {
 		Map<String, HPKC009> dKc009Map = dKc009s.stream().collect(Collectors.toMap(item ->
 				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
 						+ item.getInventType() + "#" + item.getInventCode() + "#"
-						+ item.getSpec(), item -> item));
+						+ item.getInventRecordId(), item -> item));
 		// 根据期末库存生成收发存对象
 		for (HPKC001 aItem : aItems) {
 			String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#"
 					+ aItem.getWhCode() + "#" + aItem.getMaterialType() + "#"
 					+ aItem.getMaterialCode() + "#" + aItem.getSpec();
 			HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
-			kc009.setInventType(Integer.parseInt(aItem.getMaterialType()));
+			kc009.setInventType(aItem.getMaterialType());
 			kc009.setInventCode(aItem.getMaterialCode());
 			kc009.setKcType(HPConstant.KcType.CG);
 			kc009.setDateType(queryMap.get("dateType").toString());
@@ -214,22 +216,22 @@ public class ServiceHPKC009 extends ServiceBase {
 			kc009.setEndWeight(aItem.getWeight());
 			// 收入
 			HPKC001 bKc001 = bKc001Map.get(key);
-			kc009.setStockinAmount(bKc001 == null ? BigDecimal.ZERO : BigDecimal.valueOf(bKc001.getQuantity()));
-			kc009.setStockinWeight(bKc001 == null ? BigDecimal.ZERO : bKc001.getWeight());
+			kc009.setEnterAmount(bKc001 == null ? BigDecimal.ZERO : BigDecimal.valueOf(bKc001.getQuantity()));
+			kc009.setEnterWeight(bKc001 == null ? BigDecimal.ZERO : bKc001.getWeight());
 			// 发出
 			HPKC002 cKc002 = cKc001Map.get(key);
-			kc009.setStockoutAmount(cKc002 == null ? BigDecimal.ZERO : BigDecimal.valueOf(cKc002.getQuantity()));
-			kc009.setStockoutWeight(cKc002 == null ? BigDecimal.ZERO : cKc002.getWeight());
+			kc009.setOuterAmount(cKc002 == null ? BigDecimal.ZERO : BigDecimal.valueOf(cKc002.getQuantity()));
+			kc009.setOuterWeight(cKc002 == null ? BigDecimal.ZERO : cKc002.getWeight());
 			// 期初
 			HPKC009 dKc009 = dKc009Map.get(key);
 			if (dKc009 != null) {
 				kc009.setInitAmount(dKc009.getEndAmount());
 				kc009.setInitWeight(dKc009.getEndWeight());
 			} else {
-				kc009.setInitAmount(kc009.getEndAmount().add(kc009.getStockoutAmount())
-						.subtract(kc009.getStockinAmount()));
-				kc009.setInitWeight(kc009.getEndWeight().add(kc009.getStockoutWeight())
-						.subtract(kc009.getStockinWeight()));
+				kc009.setInitAmount(kc009.getEndAmount().add(kc009.getOuterAmount())
+						.subtract(kc009.getEnterAmount()));
+				kc009.setInitWeight(kc009.getEndWeight().add(kc009.getOuterWeight())
+						.subtract(kc009.getEnterWeight()));
 			}
 			kc009Map.put(key, kc009);
 		}
@@ -272,7 +274,7 @@ public class ServiceHPKC009 extends ServiceBase {
 					+ aItem.getInventCode();
 			HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
 			kc009.setWhCode(aItem.getWhCode());
-			kc009.setInventType(aItem.getInventType());
+			kc009.setInventType(aItem.getInventType() + "");
 			kc009.setInventCode(aItem.getInventCode());
 			kc009.setKcType(HPConstant.KcType.SC);
 			kc009.setDateType(queryMap.get("dateType").toString());
@@ -282,22 +284,22 @@ public class ServiceHPKC009 extends ServiceBase {
 			kc009.setEndWeight(aItem.getWeight());
 			// 收入
 			HPKC003 bItem = bItemMap.get(key);
-			kc009.setStockinAmount(bItem == null ? BigDecimal.ZERO : bItem.getAmount());
-			kc009.setStockinWeight(bItem == null ? BigDecimal.ZERO : bItem.getWeight());
+			kc009.setEnterAmount(bItem == null ? BigDecimal.ZERO : bItem.getAmount());
+			kc009.setEnterWeight(bItem == null ? BigDecimal.ZERO : bItem.getWeight());
 			// 发出
 			HPKC004 cItem = cItemMap.get(key);
-			kc009.setStockoutAmount(cItem == null ? BigDecimal.ZERO : cItem.getAmount());
-			kc009.setStockoutWeight(cItem == null ? BigDecimal.ZERO : cItem.getWeight());
+			kc009.setOuterAmount(cItem == null ? BigDecimal.ZERO : cItem.getAmount());
+			kc009.setOuterWeight(cItem == null ? BigDecimal.ZERO : cItem.getWeight());
 			// 期初
 			HPKC009 dItem = dItemMap.get(key);
 			if (dItem != null) {
 				kc009.setInitAmount(dItem.getEndAmount());
 				kc009.setInitWeight(dItem.getEndWeight());
 			} else {
-				kc009.setInitAmount(kc009.getEndAmount().add(kc009.getStockoutAmount())
-						.subtract(kc009.getStockinAmount()));
-				kc009.setInitWeight(kc009.getEndWeight().add(kc009.getStockoutWeight())
-						.subtract(kc009.getStockinWeight()));
+				kc009.setInitAmount(kc009.getEndAmount().add(kc009.getOuterAmount())
+						.subtract(kc009.getEnterAmount()));
+				kc009.setInitWeight(kc009.getEndWeight().add(kc009.getOuterWeight())
+						.subtract(kc009.getEnterWeight()));
 			}
 			kc009Map.put(key, kc009);
 		}
@@ -338,7 +340,7 @@ public class ServiceHPKC009 extends ServiceBase {
 			String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#"
 					+ aItem.getWhCode() + "#" + aItem.getInventType() + "#" + aItem.getInventCode();
 			HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
-			kc009.setInventType(Integer.parseInt(aItem.getInventType()));
+			kc009.setInventType(aItem.getInventType());
 			kc009.setInventCode(aItem.getInventCode());
 			kc009.setKcType(HPConstant.KcType.QT);
 			kc009.setDateType(queryMap.get("dateType").toString());
@@ -348,22 +350,22 @@ public class ServiceHPKC009 extends ServiceBase {
 			kc009.setEndWeight(aItem.getWeight());
 			// 收入
 			HPKC006 bItem = bItemMap.get(key);
-			kc009.setStockinAmount(bItem == null ? BigDecimal.ZERO : bItem.getAmount());
-			kc009.setStockinWeight(bItem == null ? BigDecimal.ZERO : bItem.getWeight());
+			kc009.setEnterAmount(bItem == null ? BigDecimal.ZERO : bItem.getAmount());
+			kc009.setEnterWeight(bItem == null ? BigDecimal.ZERO : bItem.getWeight());
 			// 发出
 			HPKC007 cItem = cItemMap.get(key);
-			kc009.setStockoutAmount(cItem == null ? BigDecimal.ZERO : cItem.getAmount());
-			kc009.setStockoutWeight(cItem == null ? BigDecimal.ZERO : cItem.getWeight());
+			kc009.setOuterAmount(cItem == null ? BigDecimal.ZERO : cItem.getAmount());
+			kc009.setOuterWeight(cItem == null ? BigDecimal.ZERO : cItem.getWeight());
 			// 期初
 			HPKC009 dItem = dItemMap.get(key);
 			if (dItem != null) {
 				kc009.setInitAmount(dItem.getEndAmount());
 				kc009.setInitWeight(dItem.getEndWeight());
 			} else {
-				kc009.setInitAmount(kc009.getEndAmount().add(kc009.getStockoutAmount())
-						.subtract(kc009.getStockinAmount()));
-				kc009.setInitWeight(kc009.getEndWeight().add(kc009.getStockoutWeight())
-						.subtract(kc009.getStockinWeight()));
+				kc009.setInitAmount(kc009.getEndAmount().add(kc009.getOuterAmount())
+						.subtract(kc009.getOuterAmount()));
+				kc009.setInitWeight(kc009.getEndWeight().add(kc009.getOuterWeight())
+						.subtract(kc009.getEnterWeight()));
 			}
 			kc009Map.put(key, kc009);
 		}

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC009.xml

@@ -14,13 +14,13 @@
         INVENT_TYPE as "inventType",  <!-- 存货类型 -->
         INVENT_CODE as "inventCode",  <!-- 存货编码 -->
         INVENT_NAME as "inventName",  <!-- 存货名称 -->
-        SPEC as "spec",  <!-- 规格 -->
+        INVENT_RECORD_ID as "inventRecordId",  <!-- 规格ID -->
         INIT_AMOUNT as "initAmount",  <!-- 期初数量 -->
         INIT_WEIGHT as "initWeight",  <!-- 期初重量 -->
-        STOCKIN_AMOUNT as "stockinAmount",  <!-- 入库数量 -->
-        STOCKIN_WEIGHT as "stockinWeight",  <!-- 入库重量 -->
-        STOCKOUT_AMOUNT as "stockoutAmount",  <!-- 出库数量 -->
-        STOCKOUT_WEIGHT as "stockoutWeight",  <!-- 出库重量 -->
+        ENTER_AMOUNT as "enterAmount",  <!-- 入库数量 -->
+        ENTER_WEIGHT as "enterWeight",  <!-- 入库重量 -->
+        OUTER_AMOUNT as "outerAmount",  <!-- 出库数量 -->
+        OUTER_WEIGHT as "outerWeight",  <!-- 出库重量 -->
         END_AMOUNT as "endAmount",  <!-- 期末数量 -->
         END_WEIGHT as "endWeight",  <!-- 期末重量 -->
         CREATED_BY as "createdBy",  <!-- 创建人 -->
@@ -32,51 +32,45 @@
     </sql>
 
 	<sql id="condition">
-		<isNotEmpty prepend=" AND " property="id">
-			ID = #id#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="companyCode">
-			COMPANY_CODE = #companyCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="depCode">
-			DEP_CODE = #depCode#
-		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="id">
+            ID = #id#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="companyCode">
+            COMPANY_CODE = #companyCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="depCode">
+            DEP_CODE = #depCode#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="kcType">
             KC_TYPE = #kcType#
         </isNotEmpty>
-		<isNotEmpty prepend=" AND " property="dateType">
-			DATE_TYPE = #dateType#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="dateProc">
-			DATE_PROC = #dateProc#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="whCode">
-			WH_CODE = #whCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="whName">
-			WH_NAME = #whName#
-		</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="dateType">
+            DATE_TYPE = #dateType#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="dateProc">
+            DATE_PROC = #dateProc#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="whCode">
+            WH_CODE = #whCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="whName">
+            WH_NAME = #whName#
+        </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="inventRecordId">
+            INVENT_RECORD_ID = #inventRecordId#
+        </isNotEmpty>
 	</sql>
 
-    <!-- 查询 -->
-    <select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC009">
-        SELECT
-        <include refid="column"/>
-        FROM ${hpjxSchema}.T_HPKC009
-        WHERE 1=1
-        <include refid="condition"/>
+    <sql id="order">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="orderBy">
                 $orderBy$
@@ -85,6 +79,16 @@
                 ID asc
             </isEmpty>
         </dynamic>
+    </sql>
+
+    <!-- 查询 -->
+    <select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC009">
+        SELECT
+        <include refid="column"/>
+        FROM ${hpjxSchema}.T_HPKC009
+        WHERE 1=1
+        <include refid="condition"/>
+        <include refid="order"/>
     </select>
 
     <select id="count" resultClass="int">
@@ -97,10 +101,10 @@
         SELECT
             COALESCE(SUM(INIT_AMOUNT), 0) AS "initAmount",  <!-- 期初数量 -->
             COALESCE(SUM(INIT_WEIGHT), 0) AS "initWeight",  <!-- 期初重量 -->
-            COALESCE(SUM(STOCKIN_AMOUNT), 0) AS "stockinAmount",  <!-- 入库数量 -->
-            COALESCE(SUM(STOCKIN_WEIGHT), 0) AS "stockinWeight",  <!-- 入库重量 -->
-            COALESCE(SUM(STOCKOUT_AMOUNT), 0) AS "stockoutAmount",  <!-- 差异数量 -->
-            COALESCE(SUM(STOCKOUT_WEIGHT), 0) AS "stockoutWeight",  <!-- 差异重量 -->
+            COALESCE(SUM(ENTER_AMOUNT), 0) AS "enterAmount",  <!-- 入库数量 -->
+            COALESCE(SUM(ENTER_WEIGHT), 0) AS "enterWeight",  <!-- 入库重量 -->
+            COALESCE(SUM(OUTER_AMOUNT), 0) AS "outerAmount",  <!-- 差异数量 -->
+            COALESCE(SUM(OUTER_WEIGHT), 0) AS "outerWeight",  <!-- 差异重量 -->
             COALESCE(SUM(END_AMOUNT), 0) AS "endAmount",  <!-- 期末数量 -->
             COALESCE(SUM(END_WEIGHT), 0) AS "endWeight"  <!-- 期末重量 -->
         FROM ${hpjxSchema}.T_HPKC009
@@ -109,18 +113,37 @@
     </select>
 
     <insert id="insert">
-		INSERT INTO ${hpjxSchema}.T_HPKC009 (
-            COMPANY_CODE, DEP_CODE, KC_TYPE, DATE_TYPE, DATE_PROC, WH_CODE, WH_NAME, INVENT_TYPE,
-            INVENT_CODE, INVENT_NAME, SPEC, INIT_AMOUNT, INIT_WEIGHT, STOCKIN_AMOUNT,
-            STOCKIN_WEIGHT, STOCKOUT_AMOUNT, STOCKOUT_WEIGHT, END_AMOUNT, END_WEIGHT,
-            CREATED_BY, CREATED_NAME, CREATED_TIME
+        INSERT INTO ${hpjxSchema}.T_HPKC009 (
+            COMPANY_CODE,  <!-- 企业编码 预留 -->
+            DEP_CODE,  <!-- 部门编码 -->
+            KC_TYPE,  <!-- 库存类型：CG:采购，SC:生产，QT:其他 -->
+            DATE_TYPE,  <!-- 日期类型：DAY:天，MONTH:月 -->
+            DATE_PROC,  <!-- 日期 -->
+            WH_CODE,  <!-- 仓库编码 -->
+            WH_NAME,  <!-- 仓库名称 -->
+            INVENT_TYPE,  <!-- 存货类型 -->
+            INVENT_CODE,  <!-- 存货编码 -->
+            INVENT_NAME,  <!-- 存货名称 -->
+            INVENT_RECORD_ID,  <!-- 规格ID -->
+            INIT_AMOUNT,  <!-- 期初数量 -->
+            INIT_WEIGHT,  <!-- 期初重量 -->
+            ENTER_AMOUNT,  <!-- 入库数量 -->
+            ENTER_WEIGHT,  <!-- 入库重量 -->
+            OUTER_AMOUNT,  <!-- 出库数量 -->
+            OUTER_WEIGHT,  <!-- 出库重量 -->
+            END_AMOUNT,  <!-- 期末数量 -->
+            END_WEIGHT,  <!-- 期末重量 -->
+            CREATED_BY,  <!-- 创建人 -->
+            CREATED_NAME,  <!-- 创建人名称 -->
+            CREATED_TIME  <!-- 创建时间 -->
         ) VALUES (
-            #companyCode#, #depCode#, #kcType#, #dateType#, #dateProc#, #whCode#, #whName#, #inventType#,
-            #inventCode#, #inventName#, #spec#, #initAmount#, #initWeight#, #stockinAmount#,
-            #stockinWeight#, #stockoutAmount#, #stockoutWeight#, #endAmount#, #endWeight#,
-            #createdBy#, #createdName#, #createdTime#
+            #companyCode#, #depCode#, #kcType#, #dateType#, #dateProc#, #whCode#,
+            #whName#, #inventType#, #inventCode#, #inventName#, #inventRecordId#,
+            #initAmount#, #initWeight#, #enterAmount#, #enterWeight#, #outerAmount#,
+            #outerWeight#, #endAmount#, #endWeight#, #createdBy#, #createdName#,
+            #createdTime#
         )
-	</insert>
+    </insert>
 
 	<delete id="delete">
 		DELETE FROM ${hpjxSchema}.T_HPKC009 WHERE ID = #id#

src/main/java/com/baosight/hpjx/hp/pz/domain/HPPZ009.java

@@ -42,6 +42,12 @@ public class HPPZ009 extends DaoEPBase {
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";            /* 更新时间*/
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";            /* 是否删除：1.是,0.否*/
 	
+	public static final String QUERY = "HPPZ009.query";
+	public static final String COUNT = "HPPZ009.count";
+	public static final String INSERT = "HPPZ009.insert";
+	public static final String UPDATE = "HPPZ009.update";
+	public static final String DELETE = "HPPZ009.delete";
+	
 	private Long id = null;
 	private String companyCode = " ";        /* 企业编码*/
 	private String companyName = " ";        /* 企业名称*/

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ009.java

@@ -2,9 +2,11 @@ package com.baosight.hpjx.hp.pz.service;
 
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.pz.domain.HPPZ009;
 import com.baosight.hpjx.hp.xs.tools.HPXSUserTools;
 import com.baosight.hpjx.util.AssertUtils;
+import com.baosight.hpjx.util.DateUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.hpjx.util.RsaUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -12,6 +14,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.core.service.soa.XLocalManager;
+import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import com.baosight.xservices.xs.constants.LoginConstants;
 
@@ -111,9 +114,12 @@ public class ServiceHPPZ009 extends ServiceBase {
 	 */
 	private void add(HPPZ009 fPz009) throws Exception {
 		// 生成企业编码
-		fPz009.setCompanyCode(SequenceGenerator.getNextSequence("COMPANY_CODE"));
+		fPz009.setCompanyCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.COMPANY_CODE));
 		fPz009.setDeleteFlag(CommonConstant.YesNo.NO_0);
-		DaoUtils.insert("HPPZ009.insert", fPz009);
+		fPz009.setCreatedBy(UserSession.getLoginName());
+		fPz009.setCreatedName(UserSession.getLoginCName());
+		fPz009.setCreatedTime(DateUtils.shortDateTime());
+		dao.insert(HPPZ009.INSERT, fPz009);
 		// 默认新增企业管理员账号
 		this.initUser(fPz009);
 		// 关联企业管理员角色

src/main/java/com/baosight/iplat4j/core/data/ibatis/dao/SqlMapDaoLogProxy.java

-package com.baosight.iplat4j.core.data.ibatis.dao;
-
-import com.baosight.hpjx.core.security.UserSessionUtils;
-import com.baosight.hpjx.util.ObjectUtils;
-import com.baosight.iplat4j.core.service.soa.DomainQuery.PageStatus;
-import com.baosight.iplat4j.core.util.ExceptionUtil;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author:songx
- * @date:2024/1/24,9:00
- */
-public class SqlMapDaoLogProxy extends SqlMapDao {
-	
-	public static final String QUERY = "query";
-	
-	public SqlMapDaoLogProxy() {
-	}
-	
-	public List query(String name, Object parameters) {
-		try {
-			// 初始化参数
-			this.initParam(name, parameters);
-			List ret = super.query(name, parameters);
-			return ret;
-		} catch (RuntimeException var4) {
-			throw var4;
-		}
-	}
-	
-	public List queryAll(String name, Object parameters) {
-		try {
-			// 初始化参数
-			this.initParam(name, parameters);
-			List ret = super.queryAll(name, parameters);
-			return ret;
-		} catch (RuntimeException var4) {
-			throw var4;
-		}
-	}
-	
-	public List query(String name, Object parameters, int offset, int limit) {
-		try {
-			// 初始化参数
-			this.initParam(name, parameters);
-			List ret = super.query(name, parameters, offset, limit);
-			return ret;
-		} catch (RuntimeException var6) {
-			throw var6;
-		}
-	}
-	
-	public List query(String name, Object parameters, PageStatus pageStatus) {
-		int limit = pageStatus.getPageSize();
-		int offset = pageStatus.getPageNumber() * pageStatus.getPageSize();
-		
-		try {
-			List ret = super.query(name, parameters, offset, limit);
-			return ret;
-		} catch (RuntimeException var7) {
-			ExceptionUtil.getRootCauseMessage(var7);
-			throw var7;
-		}
-	}
-	
-	public int count(String name, Object parameters) {
-		String var3 = this.autoCount ? "query" : "count";
-		
-		try {
-			// 初始化参数
-			this.initParam(name, parameters);
-			int ret = super.count(name, parameters);
-			return ret;
-		} catch (RuntimeException var5) {
-			throw var5;
-		}
-	}
-	
-	public void insert(String name, Object object) {
-		String var3 = "insert";
-		
-		try {
-			super.insert(name, object);
-		} catch (RuntimeException var5) {
-			throw var5;
-		}
-	}
-	
-	public int update(String name, Object object) {
-		String var3 = "update";
-		
-		try {
-			int ret = super.update(name, object);
-			return ret;
-		} catch (RuntimeException var5) {
-			throw var5;
-		}
-	}
-	
-	public int delete(String name, Object parameters) {
-		String var3 = "delete";
-		
-		try {
-			int ret = super.delete(name, parameters);
-			return ret;
-		} catch (RuntimeException var5) {
-			throw var5;
-		}
-	}
-	
-	public int insertBatch(String name, Collection parameters) {
-		String operation = "insert";
-		
-		try {
-			this.getStatementName(operation, name);
-			int ret = super.insertBatch(name, parameters);
-			return ret;
-		} catch (RuntimeException var5) {
-			throw var5;
-		}
-	}
-	
-	public int updateBatch(String name, Collection parameters) {
-		String operation = "update";
-		
-		try {
-			this.getStatementName(operation, name);
-			int ret = super.updateBatch(name, parameters);
-			return ret;
-		} catch (RuntimeException var5) {
-			throw var5;
-		}
-	}
-	
-	public int deleteBatch(String name, Collection parameters) {
-		String operation = "delete";
-		
-		try {
-			this.getStatementName(operation, name);
-			int ret = super.deleteBatch(name, parameters);
-			return ret;
-		} catch (RuntimeException var5) {
-			throw var5;
-		}
-	}
-	
-	/**
-	 * 初始化参数
-	 *
-	 * @param name
-	 * @param parameters
-	 */
-	private void initParam(String name, Object parameters) {
-		// 查询登录用户信息时不设置企业编码，否则会形成死循环
-		if ("HPXSUser.query".equals(name)) {
-			return;
-		}
-		if(!(parameters instanceof Map)){
-			return;
-		}
-		if (parameters == null) {
-			parameters = new HashMap();
-		}
-		// 企业编码
-		((Map) parameters).put("companyCode", UserSessionUtils.getCompanyCode());
-		// 部门编码
-//		((Map) parameters).put("depCode", UserSessionUtils.getDepCode());
-	}
-}

src/main/webapp/HP/KC/HPKC009.jsp

@@ -8,16 +8,26 @@
 <EF:EFPage title="库存收发存">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFDatePicker ename="inqu_status-0-dateProc" cname="日期:" start="year" depth="year"
-			                 role="date" format="yyyy-MM" readonly="true"/>
-			<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型:" filter="contains" defaultValue="">
-				<EF:EFOption label="请选择" value=""/>
+			<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
+			                 role="date" format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFSelect>
-			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" filter="contains" defultValue="">
-				<EF:EFOption label="请选择" value=""/>
+			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+		</div>
+		<div class="row">
+			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 
@@ -28,18 +38,16 @@
 				<EF:EFCodeOption codeName="hpjx.hpkc.kcType"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn cname="日期" ename="dateProc" enable="false" width="90" align="center"/>
-			<EF:EFComboColumn cname="仓库名称" ename="whCode" enable="false" columnTemplate="#=textField#"
-			                  itemTemplate="#=textField#" blockName="wh_record_block_id"
-			                  textField="textField" valueField="valueField"
-			                  align="center" filter="contains" width="100">
-			</EF:EFComboColumn>
 			<EF:EFComboColumn cname="存货类型" ename="inventType" enable="false" width="90" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
-			<EF:EFComboColumn cname="存货名称" ename="inventCode" enable="false" columnTemplate="#=textField#"
-			                  itemTemplate="#=textField#" blockName="invent_name_block_id"
-			                  textField="textField" valueField="valueField"
-			                  align="center" filter="contains" width="100">
+			<EF:EFComboColumn cname="仓库名称" ename="whCode" enable="false" width="100" align="center"
+			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFComboColumn cname="存货名称" ename="inventCode" enable="false" width="100" align="center"
+			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
 			<EF:EFColumn cname="规格" ename="spec" enable="false" width="120"/>
 			<EF:EFColumn cname="期初数量" ename="initAmount" enable="false" width="90" align="right" format="{0:N3}"

src/main/webapp/HP/PZ/HPPZ009.jsp

@@ -29,7 +29,6 @@
 			<EF:EFColumn cname="修改时间" ename="updatedTime" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
 		</EF:EFGrid>
+		<p class="text-info"><span style='color: red;'>注：新增企业时会新增企业管理员账户，账号和密码与企业编码相同</span></p>
 	</EF:EFRegion>
 </EF:EFPage>
-<%--<script src="${iPlatStaticURL}/common/js/common.js"></script>--%>
-<%--<script src="${iPlatStaticURL}/common/js/jsUtils.js"></script>--%>