Skip to content

H
hp-smart
Commit 04dcf5ec by 宋祥
Options

1.库存收发存字段调整

parent c90e8451
Showing with 135 additions and 169 deletions
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java
...@@ -4,6 +4,7 @@ import com.baosight.hpjx.common.DdynamicEnum; ...@@ -4,6 +4,7 @@ import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant; 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.HPKC005;
import com.baosight.hpjx.hp.kc.domain.HPKC006; import com.baosight.hpjx.hp.kc.domain.HPKC006;
import com.baosight.hpjx.hp.kc.domain.HPKC007; import com.baosight.hpjx.hp.kc.domain.HPKC007;
...@@ -55,7 +56,10 @@ public class ServiceHPKC005 extends ServiceBase { ...@@ -55,7 +56,10 @@ public class ServiceHPKC005 extends ServiceBase {
} }
/** /**
* 查询操作. * 查询操作
*
* @param inInfo
* @return
*/ */
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
...@@ -64,8 +68,8 @@ public class ServiceHPKC005 extends ServiceBase { ...@@ -64,8 +68,8 @@ public class ServiceHPKC005 extends ServiceBase {
String receiptDate = MapUtils.getString(queryRow, "receiptDate"); String receiptDate = MapUtils.getString(queryRow, "receiptDate");
queryRow.put("receiptDate", StringUtil.removeSpecifiedCharacter(receiptDate, queryRow.put("receiptDate", StringUtil.removeSpecifiedCharacter(receiptDate,
StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED)); StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
inInfo = super.query(inInfo, "HPKC005.query", new HPKC005()); inInfo = super.query(inInfo, HPKC005.QUERY, new HPKC005());
List sum = dao.query("HPKC005.querySum", queryRow); List sum = dao.query(HPSqlConstant.HPKC005.QUERY_SUM, queryRow);
inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0)); inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败"); LogUtils.setDetailMsg(inInfo, e, "查询失败");
...@@ -74,75 +78,11 @@ public class ServiceHPKC005 extends ServiceBase { ...@@ -74,75 +78,11 @@ public class ServiceHPKC005 extends ServiceBase {
} }
/** /**
* 保存操作. * 新增操作
* *
* @param inInfo * @param inInfo
* @return * @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 @Override
public EiInfo insert(EiInfo inInfo) { public EiInfo insert(EiInfo inInfo) {
try { try {
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC008.java
...@@ -26,7 +26,10 @@ import java.util.Map; ...@@ -26,7 +26,10 @@ import java.util.Map;
public class ServiceHPKC008 extends ServiceBase { public class ServiceHPKC008 extends ServiceBase {
/** /**
* 画面初始化. * 画面初始化
*
* @param inInfo
* @return
*/ */
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
try { try {
...@@ -39,7 +42,10 @@ public class ServiceHPKC008 extends ServiceBase { ...@@ -39,7 +42,10 @@ public class ServiceHPKC008 extends ServiceBase {
} }
/** /**
* 查询操作. * 查询操作
*
* @param inInfo
* @return
*/ */
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
...@@ -80,6 +86,8 @@ public class ServiceHPKC008 extends ServiceBase { ...@@ -80,6 +86,8 @@ public class ServiceHPKC008 extends ServiceBase {
HPConstant.SequenceId.HPKC008_NUMBER)); HPConstant.SequenceId.HPKC008_NUMBER));
DaoUtils.insert(HPKC008.INSERT, fKc008); DaoUtils.insert(HPKC008.INSERT, fKc008);
} }
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!"); inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, 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 { ...@@ -57,6 +57,8 @@ public class ServiceHPKC009 extends ServiceBase {
try { try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null); 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_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); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC009().eiMetadata);
} catch (PlatException e) { } catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败"); LogUtils.setDetailMsg(inInfo, e, "初始化失败");
...@@ -78,7 +80,7 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -78,7 +80,7 @@ public class ServiceHPKC009 extends ServiceBase {
queryRow.put("dateProc", StringUtil.removeSpecifiedCharacter(receiptDate, queryRow.put("dateProc", StringUtil.removeSpecifiedCharacter(receiptDate,
StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED)); StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
queryRow.put("dateType", CommonConstant.DateType.MONTH); 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); List sum = dao.query("HPKC009.querySum", queryRow);
inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0)); inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
} catch (Exception e) { } catch (Exception e) {
...@@ -197,14 +199,14 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -197,14 +199,14 @@ public class ServiceHPKC009 extends ServiceBase {
Map<String, HPKC009> dKc009Map = dKc009s.stream().collect(Collectors.toMap(item -> Map<String, HPKC009> dKc009Map = dKc009s.stream().collect(Collectors.toMap(item ->
item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#" item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+ item.getInventType() + "#" + item.getInventCode() + "#" + item.getInventType() + "#" + item.getInventCode() + "#"
+ item.getSpec(), item -> item)); + item.getInventRecordId(), item -> item));
// 根据期末库存生成收发存对象 // 根据期末库存生成收发存对象
for (HPKC001 aItem : aItems) { for (HPKC001 aItem : aItems) {
String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#" String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#"
+ aItem.getWhCode() + "#" + aItem.getMaterialType() + "#" + aItem.getWhCode() + "#" + aItem.getMaterialType() + "#"
+ aItem.getMaterialCode() + "#" + aItem.getSpec(); + aItem.getMaterialCode() + "#" + aItem.getSpec();
HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class); HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
kc009.setInventType(Integer.parseInt(aItem.getMaterialType())); kc009.setInventType(aItem.getMaterialType());
kc009.setInventCode(aItem.getMaterialCode()); kc009.setInventCode(aItem.getMaterialCode());
kc009.setKcType(HPConstant.KcType.CG); kc009.setKcType(HPConstant.KcType.CG);
kc009.setDateType(queryMap.get("dateType").toString()); kc009.setDateType(queryMap.get("dateType").toString());
...@@ -214,22 +216,22 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -214,22 +216,22 @@ public class ServiceHPKC009 extends ServiceBase {
kc009.setEndWeight(aItem.getWeight()); kc009.setEndWeight(aItem.getWeight());
// 收入 // 收入
HPKC001 bKc001 = bKc001Map.get(key); HPKC001 bKc001 = bKc001Map.get(key);
kc009.setStockinAmount(bKc001 == null ? BigDecimal.ZERO : BigDecimal.valueOf(bKc001.getQuantity())); kc009.setEnterAmount(bKc001 == null ? BigDecimal.ZERO : BigDecimal.valueOf(bKc001.getQuantity()));
kc009.setStockinWeight(bKc001 == null ? BigDecimal.ZERO : bKc001.getWeight()); kc009.setEnterWeight(bKc001 == null ? BigDecimal.ZERO : bKc001.getWeight());
// 发出 // 发出
HPKC002 cKc002 = cKc001Map.get(key); HPKC002 cKc002 = cKc001Map.get(key);
kc009.setStockoutAmount(cKc002 == null ? BigDecimal.ZERO : BigDecimal.valueOf(cKc002.getQuantity())); kc009.setOuterAmount(cKc002 == null ? BigDecimal.ZERO : BigDecimal.valueOf(cKc002.getQuantity()));
kc009.setStockoutWeight(cKc002 == null ? BigDecimal.ZERO : cKc002.getWeight()); kc009.setOuterWeight(cKc002 == null ? BigDecimal.ZERO : cKc002.getWeight());
// 期初 // 期初
HPKC009 dKc009 = dKc009Map.get(key); HPKC009 dKc009 = dKc009Map.get(key);
if (dKc009 != null) { if (dKc009 != null) {
kc009.setInitAmount(dKc009.getEndAmount()); kc009.setInitAmount(dKc009.getEndAmount());
kc009.setInitWeight(dKc009.getEndWeight()); kc009.setInitWeight(dKc009.getEndWeight());
} else { } else {
kc009.setInitAmount(kc009.getEndAmount().add(kc009.getStockoutAmount()) kc009.setInitAmount(kc009.getEndAmount().add(kc009.getOuterAmount())
.subtract(kc009.getStockinAmount())); .subtract(kc009.getEnterAmount()));
kc009.setInitWeight(kc009.getEndWeight().add(kc009.getStockoutWeight()) kc009.setInitWeight(kc009.getEndWeight().add(kc009.getOuterWeight())
.subtract(kc009.getStockinWeight())); .subtract(kc009.getEnterWeight()));
} }
kc009Map.put(key, kc009); kc009Map.put(key, kc009);
} }
...@@ -272,7 +274,7 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -272,7 +274,7 @@ public class ServiceHPKC009 extends ServiceBase {
+ aItem.getInventCode(); + aItem.getInventCode();
HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class); HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
kc009.setWhCode(aItem.getWhCode()); kc009.setWhCode(aItem.getWhCode());
kc009.setInventType(aItem.getInventType()); kc009.setInventType(aItem.getInventType() + "");
kc009.setInventCode(aItem.getInventCode()); kc009.setInventCode(aItem.getInventCode());
kc009.setKcType(HPConstant.KcType.SC); kc009.setKcType(HPConstant.KcType.SC);
kc009.setDateType(queryMap.get("dateType").toString()); kc009.setDateType(queryMap.get("dateType").toString());
...@@ -282,22 +284,22 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -282,22 +284,22 @@ public class ServiceHPKC009 extends ServiceBase {
kc009.setEndWeight(aItem.getWeight()); kc009.setEndWeight(aItem.getWeight());
// 收入 // 收入
HPKC003 bItem = bItemMap.get(key); HPKC003 bItem = bItemMap.get(key);
kc009.setStockinAmount(bItem == null ? BigDecimal.ZERO : bItem.getAmount()); kc009.setEnterAmount(bItem == null ? BigDecimal.ZERO : bItem.getAmount());
kc009.setStockinWeight(bItem == null ? BigDecimal.ZERO : bItem.getWeight()); kc009.setEnterWeight(bItem == null ? BigDecimal.ZERO : bItem.getWeight());
// 发出 // 发出
HPKC004 cItem = cItemMap.get(key); HPKC004 cItem = cItemMap.get(key);
kc009.setStockoutAmount(cItem == null ? BigDecimal.ZERO : cItem.getAmount()); kc009.setOuterAmount(cItem == null ? BigDecimal.ZERO : cItem.getAmount());
kc009.setStockoutWeight(cItem == null ? BigDecimal.ZERO : cItem.getWeight()); kc009.setOuterWeight(cItem == null ? BigDecimal.ZERO : cItem.getWeight());
// 期初 // 期初
HPKC009 dItem = dItemMap.get(key); HPKC009 dItem = dItemMap.get(key);
if (dItem != null) { if (dItem != null) {
kc009.setInitAmount(dItem.getEndAmount()); kc009.setInitAmount(dItem.getEndAmount());
kc009.setInitWeight(dItem.getEndWeight()); kc009.setInitWeight(dItem.getEndWeight());
} else { } else {
kc009.setInitAmount(kc009.getEndAmount().add(kc009.getStockoutAmount()) kc009.setInitAmount(kc009.getEndAmount().add(kc009.getOuterAmount())
.subtract(kc009.getStockinAmount())); .subtract(kc009.getEnterAmount()));
kc009.setInitWeight(kc009.getEndWeight().add(kc009.getStockoutWeight()) kc009.setInitWeight(kc009.getEndWeight().add(kc009.getOuterWeight())
.subtract(kc009.getStockinWeight())); .subtract(kc009.getEnterWeight()));
} }
kc009Map.put(key, kc009); kc009Map.put(key, kc009);
} }
...@@ -338,7 +340,7 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -338,7 +340,7 @@ public class ServiceHPKC009 extends ServiceBase {
String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#" String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#"
+ aItem.getWhCode() + "#" + aItem.getInventType() + "#" + aItem.getInventCode(); + aItem.getWhCode() + "#" + aItem.getInventType() + "#" + aItem.getInventCode();
HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class); HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
kc009.setInventType(Integer.parseInt(aItem.getInventType())); kc009.setInventType(aItem.getInventType());
kc009.setInventCode(aItem.getInventCode()); kc009.setInventCode(aItem.getInventCode());
kc009.setKcType(HPConstant.KcType.QT); kc009.setKcType(HPConstant.KcType.QT);
kc009.setDateType(queryMap.get("dateType").toString()); kc009.setDateType(queryMap.get("dateType").toString());
...@@ -348,22 +350,22 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -348,22 +350,22 @@ public class ServiceHPKC009 extends ServiceBase {
kc009.setEndWeight(aItem.getWeight()); kc009.setEndWeight(aItem.getWeight());
// 收入 // 收入
HPKC006 bItem = bItemMap.get(key); HPKC006 bItem = bItemMap.get(key);
kc009.setStockinAmount(bItem == null ? BigDecimal.ZERO : bItem.getAmount()); kc009.setEnterAmount(bItem == null ? BigDecimal.ZERO : bItem.getAmount());
kc009.setStockinWeight(bItem == null ? BigDecimal.ZERO : bItem.getWeight()); kc009.setEnterWeight(bItem == null ? BigDecimal.ZERO : bItem.getWeight());
// 发出 // 发出
HPKC007 cItem = cItemMap.get(key); HPKC007 cItem = cItemMap.get(key);
kc009.setStockoutAmount(cItem == null ? BigDecimal.ZERO : cItem.getAmount()); kc009.setOuterAmount(cItem == null ? BigDecimal.ZERO : cItem.getAmount());
kc009.setStockoutWeight(cItem == null ? BigDecimal.ZERO : cItem.getWeight()); kc009.setOuterWeight(cItem == null ? BigDecimal.ZERO : cItem.getWeight());
// 期初 // 期初
HPKC009 dItem = dItemMap.get(key); HPKC009 dItem = dItemMap.get(key);
if (dItem != null) { if (dItem != null) {
kc009.setInitAmount(dItem.getEndAmount()); kc009.setInitAmount(dItem.getEndAmount());
kc009.setInitWeight(dItem.getEndWeight()); kc009.setInitWeight(dItem.getEndWeight());
} else { } else {
kc009.setInitAmount(kc009.getEndAmount().add(kc009.getStockoutAmount()) kc009.setInitAmount(kc009.getEndAmount().add(kc009.getOuterAmount())
.subtract(kc009.getStockinAmount())); .subtract(kc009.getOuterAmount()));
kc009.setInitWeight(kc009.getEndWeight().add(kc009.getStockoutWeight()) kc009.setInitWeight(kc009.getEndWeight().add(kc009.getOuterWeight())
.subtract(kc009.getStockinWeight())); .subtract(kc009.getEnterWeight()));
} }
kc009Map.put(key, kc009); kc009Map.put(key, kc009);
} }
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC009.xml
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
INVENT_TYPE as "inventType", <!-- 存货类型 --> INVENT_TYPE as "inventType", <!-- 存货类型 -->
INVENT_CODE as "inventCode", <!-- 存货编码 --> INVENT_CODE as "inventCode", <!-- 存货编码 -->
INVENT_NAME as "inventName", <!-- 存货名称 --> INVENT_NAME as "inventName", <!-- 存货名称 -->
SPEC as "spec", <!-- 规格 --> INVENT_RECORD_ID as "inventRecordId", <!-- 规格ID -->
INIT_AMOUNT as "initAmount", <!-- 期初数量 --> INIT_AMOUNT as "initAmount", <!-- 期初数量 -->
INIT_WEIGHT as "initWeight", <!-- 期初重量 --> INIT_WEIGHT as "initWeight", <!-- 期初重量 -->
STOCKIN_AMOUNT as "stockinAmount", <!-- 入库数量 --> ENTER_AMOUNT as "enterAmount", <!-- 入库数量 -->
STOCKIN_WEIGHT as "stockinWeight", <!-- 入库重量 --> ENTER_WEIGHT as "enterWeight", <!-- 入库重量 -->
STOCKOUT_AMOUNT as "stockoutAmount", <!-- 出库数量 --> OUTER_AMOUNT as "outerAmount", <!-- 出库数量 -->
STOCKOUT_WEIGHT as "stockoutWeight", <!-- 出库重量 --> OUTER_WEIGHT as "outerWeight", <!-- 出库重量 -->
END_AMOUNT as "endAmount", <!-- 期末数量 --> END_AMOUNT as "endAmount", <!-- 期末数量 -->
END_WEIGHT as "endWeight", <!-- 期末重量 --> END_WEIGHT as "endWeight", <!-- 期末重量 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
...@@ -65,18 +65,12 @@ ...@@ -65,18 +65,12 @@
<isNotEmpty prepend=" AND " property="inventName"> <isNotEmpty prepend=" AND " property="inventName">
INVENT_NAME = #inventName# INVENT_NAME = #inventName#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="spec"> <isNotEmpty prepend=" AND " property="inventRecordId">
SPEC = #spec# INVENT_RECORD_ID = #inventRecordId#
</isNotEmpty> </isNotEmpty>
</sql> </sql>
<!-- 查询 --> <sql id="order">
<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"/>
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
...@@ -85,6 +79,16 @@ ...@@ -85,6 +79,16 @@
ID asc ID asc
</isEmpty> </isEmpty>
</dynamic> </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>
<select id="count" resultClass="int"> <select id="count" resultClass="int">
...@@ -97,10 +101,10 @@ ...@@ -97,10 +101,10 @@
SELECT SELECT
COALESCE(SUM(INIT_AMOUNT), 0) AS "initAmount", <!-- 期初数量 --> COALESCE(SUM(INIT_AMOUNT), 0) AS "initAmount", <!-- 期初数量 -->
COALESCE(SUM(INIT_WEIGHT), 0) AS "initWeight", <!-- 期初重量 --> COALESCE(SUM(INIT_WEIGHT), 0) AS "initWeight", <!-- 期初重量 -->
COALESCE(SUM(STOCKIN_AMOUNT), 0) AS "stockinAmount", <!-- 入库数量 --> COALESCE(SUM(ENTER_AMOUNT), 0) AS "enterAmount", <!-- 入库数量 -->
COALESCE(SUM(STOCKIN_WEIGHT), 0) AS "stockinWeight", <!-- 入库重量 --> COALESCE(SUM(ENTER_WEIGHT), 0) AS "enterWeight", <!-- 入库重量 -->
COALESCE(SUM(STOCKOUT_AMOUNT), 0) AS "stockoutAmount", <!-- 差异数量 --> COALESCE(SUM(OUTER_AMOUNT), 0) AS "outerAmount", <!-- 差异数量 -->
COALESCE(SUM(STOCKOUT_WEIGHT), 0) AS "stockoutWeight", <!-- 差异重量 --> COALESCE(SUM(OUTER_WEIGHT), 0) AS "outerWeight", <!-- 差异重量 -->
COALESCE(SUM(END_AMOUNT), 0) AS "endAmount", <!-- 期末数量 --> COALESCE(SUM(END_AMOUNT), 0) AS "endAmount", <!-- 期末数量 -->
COALESCE(SUM(END_WEIGHT), 0) AS "endWeight" <!-- 期末重量 --> COALESCE(SUM(END_WEIGHT), 0) AS "endWeight" <!-- 期末重量 -->
FROM ${hpjxSchema}.T_HPKC009 FROM ${hpjxSchema}.T_HPKC009
...@@ -110,15 +114,34 @@ ...@@ -110,15 +114,34 @@
<insert id="insert"> <insert id="insert">
INSERT INTO ${hpjxSchema}.T_HPKC009 ( INSERT INTO ${hpjxSchema}.T_HPKC009 (
COMPANY_CODE, DEP_CODE, KC_TYPE, DATE_TYPE, DATE_PROC, WH_CODE, WH_NAME, INVENT_TYPE, COMPANY_CODE, <!-- 企业编码 预留 -->
INVENT_CODE, INVENT_NAME, SPEC, INIT_AMOUNT, INIT_WEIGHT, STOCKIN_AMOUNT, DEP_CODE, <!-- 部门编码 -->
STOCKIN_WEIGHT, STOCKOUT_AMOUNT, STOCKOUT_WEIGHT, END_AMOUNT, END_WEIGHT, KC_TYPE, <!-- 库存类型：CG:采购，SC:生产，QT:其他 -->
CREATED_BY, CREATED_NAME, CREATED_TIME 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 ( ) VALUES (
#companyCode#, #depCode#, #kcType#, #dateType#, #dateProc#, #whCode#, #whName#, #inventType#, #companyCode#, #depCode#, #kcType#, #dateType#, #dateProc#, #whCode#,
#inventCode#, #inventName#, #spec#, #initAmount#, #initWeight#, #stockinAmount#, #whName#, #inventType#, #inventCode#, #inventName#, #inventRecordId#,
#stockinWeight#, #stockoutAmount#, #stockoutWeight#, #endAmount#, #endWeight#, #initAmount#, #initWeight#, #enterAmount#, #enterWeight#, #outerAmount#,
#createdBy#, #createdName#, #createdTime# #outerWeight#, #endAmount#, #endWeight#, #createdBy#, #createdName#,
#createdTime#
) )
</insert> </insert>
......
src/main/webapp/HP/KC/HPKC005.js
...@@ -51,11 +51,6 @@ $(function() { ...@@ -51,11 +51,6 @@ $(function() {
template: function (options) { template: function (options) {
return showUserName(options.createdBy, options.createdName); return showUserName(options.createdBy, options.createdName);
} }
}, {
field: "updatedName",
template: function (options) {
return showUserName(options.updatedBy, options.updatedName);
}
}], }],
loadComplete: function (grid) { loadComplete: function (grid) {
} }
......
src/main/webapp/HP/KC/HPKC005.jsp
...@@ -22,12 +22,6 @@ ...@@ -22,12 +22,6 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<%--<EF:EFSelect ename="inqu_status-0-status" cname="单据状态" filter="contains" required="false"
template="#=textField#" valueTemplate="#=textField#" defaultValue="">
<EF:EFOption label="请选择" value=""></EF:EFOption>
<EF:EFOption label="0-待审核" value="0"></EF:EFOption>
<EF:EFOption label="1-已审核" value="1"></EF:EFOption>
</EF:EFSelect>--%>
</div> </div>
<div class="row"> <div class="row">
<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue=""> <EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
...@@ -42,36 +36,32 @@ ...@@ -42,36 +36,32 @@
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="checkNo" cname="盘点单号" enable="false" width="140" align="center"/> <EF:EFColumn ename="checkNo" cname="盘点单号" enable="false" width="140" align="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd" <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/> parseFormats="['yyyyMMdd']" width="90" align="center" readonly="true"/>
<%--<EF:EFComboColumn ename="status" cname="单据状态" enable="false" width="100" readonly="true"
textField="textField" valueField="valueField" align="center">
<EF:EFOption label="0-待审核" value="0"></EF:EFOption>
<EF:EFOption label="1-已审核" value="1"></EF:EFOption>
</EF:EFComboColumn>--%>
<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#" <EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
itemTemplate="#=textField#" blockName="wh_record_block_id" itemTemplate="#=textField#" blockName="wh_record_block_id"
textField="textField" valueField="valueField" textField="textField" valueField="valueField"
align="center" filter="contains" required="true"> align="center" filter="contains" readonly="true">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true"> <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center"
readonly="true">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true"/> <EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" readonly="true"/>
<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center"/> <EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" readonly="true"/>
<EF:EFColumn ename="bookAmount" cname="账面数量" format="{0:N3}" maxLength="20" width="90" align="right" <EF:EFColumn ename="bookAmount" cname="账面数量" format="{0:N3}" maxLength="20" width="90" align="right"
sumType="all" required="true"/> sumType="all" readonly="true"/>
<EF:EFColumn ename="bookWeight" cname="账面重量" format="{0:N3}" maxLength="20" width="90" align="right" <EF:EFColumn ename="bookWeight" cname="账面重量" format="{0:N3}" maxLength="20" width="90" align="right"
sumType="all" required="true"/> sumType="all" readonly="true"/>
<EF:EFColumn ename="entityAmount" cname="实物数量" format="{0:N3}" maxLength="20" width="100" align="right" <EF:EFColumn ename="entityAmount" cname="实物数量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all" required="true"/> sumType="all" readonly="true"/>
<EF:EFColumn ename="entityWeight" cname="实物重量" format="{0:N3}" maxLength="20" width="100" align="right" <EF:EFColumn ename="entityWeight" cname="实物重量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all" required="true"/> sumType="all" readonly="true"/>
<EF:EFColumn ename="diffAmount" cname="差异数量" enable="false" format="{0:N3}" maxLength="20" width="100" <EF:EFColumn ename="diffAmount" cname="差异数量" enable="false" format="{0:N3}" maxLength="20" width="100"
align="right" sumType="all"/> align="right" sumType="all" required="true" readonly="true"/>
<EF:EFColumn ename="diffWeight" cname="差异重量" enable="false" format="{0:N3}" maxLength="20" width="100" <EF:EFColumn ename="diffWeight" cname="差异重量" enable="false" format="{0:N3}" maxLength="20" width="100"
align="right" sumType="all"/> align="right" sumType="all" required="true" readonly="true"/>
<EF:EFColumn ename="notes" cname="备注" width="100"/> <EF:EFColumn ename="notes" cname="备注" width="100" readonly="true"/>
<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/> <EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center" <EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']"/> editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
</EF:EFGrid> </EF:EFGrid>
......
src/main/webapp/HP/KC/HPKC009.jsp
...@@ -8,16 +8,26 @@ ...@@ -8,16 +8,26 @@
<EF:EFPage title="库存收发存"> <EF:EFPage title="库存收发存">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFDatePicker ename="inqu_status-0-dateProc" cname="日期:" start="year" depth="year" <EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
role="date" format="yyyy-MM" readonly="true"/> role="date" format="yyyy-MM-dd" readonly="true"/>
<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型:" filter="contains" defaultValue=""> <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
<EF:EFOption label="请选择" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" filter="contains" defultValue=""> <EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
<EF:EFOption label="请选择" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </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> </div>
</EF:EFRegion> </EF:EFRegion>
...@@ -28,18 +38,16 @@ ...@@ -28,18 +38,16 @@
<EF:EFCodeOption codeName="hpjx.hpkc.kcType"/> <EF:EFCodeOption codeName="hpjx.hpkc.kcType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn cname="日期" ename="dateProc" enable="false" width="90" align="center"/> <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:EFComboColumn cname="存货类型" ename="inventType" enable="false" width="90" align="center">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn cname="存货名称" ename="inventCode" enable="false" columnTemplate="#=textField#" <EF:EFComboColumn cname="仓库名称" ename="whCode" enable="false" width="100" align="center"
itemTemplate="#=textField#" blockName="invent_name_block_id" blockName="wh_record_block_id" textField="textField" valueField="valueField"
textField="textField" valueField="valueField" columnTemplate="#=textField#" itemTemplate="#=textField#">
align="center" filter="contains" width="100"> </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:EFComboColumn>
<EF:EFColumn cname="规格" ename="spec" enable="false" width="120"/> <EF:EFColumn cname="规格" ename="spec" enable="false" width="120"/>
<EF:EFColumn cname="期初数量" ename="initAmount" enable="false" width="90" align="right" format="{0:N3}" <EF:EFColumn cname="期初数量" ename="initAmount" enable="false" width="90" align="right" format="{0:N3}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment