Skip to content

H
hp-smart
Commit 60682ab7 by 江和松
Options

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

parents f61d98f4 e07966f6
Showing with 343 additions and 301 deletions
src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC005.java
......@@ -70,11 +70,11 @@ public class HPKC005 extends DaoEPBase {
public static final String COL_UPDATED_TIME = "UPDATED_TIME"; /* 更新时间*/
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/
public static final String QUERY = "t_hpkc005.query";
public static final String COUNT = "t_hpkc005.count";
public static final String INSERT = "t_hpkc005.insert";
public static final String UPDATE = "t_hpkc005.update";
public static final String DELETE = "t_hpkc005.delete";
public static final String QUERY = "HPKC005.query";
public static final String COUNT = "HPKC005.count";
public static final String INSERT = "HPKC005.insert";
public static final String UPDATE = "HPKC005.update";
public static final String DELETE = "HPKC005.delete";
private Long id = new Long(0);
private String companyCode = " "; /* 企业编码 预留*/
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java
......@@ -4,8 +4,6 @@ import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC005;
import com.baosight.hpjx.hp.pz.domain.HPPZ007;
import com.baosight.hpjx.hp.pz.domain.HPPZ004;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.util.AssertUtils;
import com.baosight.hpjx.util.CommonMethod;
......@@ -20,9 +18,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import org.apache.commons.collections.MapUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -84,12 +80,8 @@ public class ServiceHPKC005 extends ServiceBase {
for (int i = 0; i < resultRows.size(); i++) {
HPKC005 fKc005 = new HPKC005();
fKc005.fromMap(resultRows.get(i));
// 去除日期字符串中的-
fKc005.setReceiptDate(StringUtil.removeHorizontalLine(fKc005.getReceiptDate()));
// 仓库名称
fKc005.setWhName(HPPZTools.getPz007ByCode(fKc005.getWhCode()).getWhName());
// 物料名称
fKc005.setInventName(HPPZTools.getPz004ByCode(fKc005.getInventCode()).getInventName());
// 设置基础信息
this.setBaseInfo(fKc005);
if (fKc005.getId() == null || fKc005.getId() == 0) {
this.add(fKc005);
} else {
......@@ -151,16 +143,12 @@ public class ServiceHPKC005 extends ServiceBase {
for (int i = 0; i < resultRows.size(); i++) {
HPKC005 fKc005 = new HPKC005();
fKc005.fromMap(resultRows.get(i));
// 去除日期字符串中的-
fKc005.setReceiptDate(StringUtil.removeHorizontalLine(fKc005.getReceiptDate()));
// 仓库名称
fKc005.setWhName(HPPZTools.getPz007ByCode(fKc005.getWhCode()).getWhName());
// 物料名称
fKc005.setInventName(HPPZTools.getPz004ByCode(fKc005.getInventCode()).getInventName());
// 设置基础信息
this.setBaseInfo(fKc005);
// 生成单据号
fKc005.setStatisticalNumber(SequenceGenerator.getNextSequence(
HPConstant.SequenceId.STATISTICAL_NUMBER));
DaoUtils.insert("HPKC005.insert", fKc005);
DaoUtils.insert(HPKC005.INSERT, fKc005);
}
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
} catch (Exception e) {
......@@ -181,11 +169,9 @@ public class ServiceHPKC005 extends ServiceBase {
for (int i = 0; i < eiBlock.getRowCount(); i++) {
HPKC005 fKc005 = new HPKC005();
fKc005.fromMap(eiBlock.getRow(i));
// 仓库名称
fKc005.setWhName(HPPZTools.getPz007ByCode(fKc005.getWhCode()).getWhName());
// 物料名称
fKc005.setInventName(HPPZTools.getPz004ByCode(fKc005.getInventCode()).getInventName());
this.dao.update("HPKC005.update", fKc005);
// 设置基础信息
this.setBaseInfo(fKc005);
DaoUtils.update(HPKC005.UPDATE, fKc005);
}
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
......@@ -197,27 +183,42 @@ public class ServiceHPKC005 extends ServiceBase {
}
/**
* 删除操作.
* 设置基础信息
*
* @param fKc005
*/
public EiInfo delete(EiInfo eiInfo) {
HPKC005 HPKC005 = new HPKC005();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
private void setBaseInfo(HPKC005 fKc005) {
// 去除日期字符串中的-
fKc005.setReceiptDate(StringUtil.removeHorizontalLine(fKc005.getReceiptDate()));
// 仓库名称
fKc005.setWhName(HPPZTools.getPz007ByCode(fKc005.getWhCode()).getWhName());
// 物料名称
fKc005.setInventName(HPPZTools.getPz004ByCode(fKc005.getInventCode()).getInventName());
// 差异数量
fKc005.setDiffAmount(fKc005.getEntityAmount().subtract(fKc005.getBookAmount()));
// 差异重量
fKc005.setDiffWeight(fKc005.getEntityWeight().subtract(fKc005.getBookWeight()));
}
/**
* 删除操作
*
* @param inInfo
* @return
*/
public EiInfo delete(EiInfo inInfo) {
try {
for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i);
HPKC005.fromMap(map);
this.dao.delete("HPKC005.delete", HPKC005.toMap());
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
DaoUtils.update(HPKC005.DELETE, resultRows.get(i));
}
} catch (PlatException e) {
eiInfo.setStatus(EiConstant.STATUS_FAILURE);
eiInfo.setMsg("删除失败，原因参见详细错误描述！");
eiInfo.setDetailMsg(e.getMessage());
logError("删除失败！", e.getMessage());
return eiInfo;
}
eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("删除成功！");
return eiInfo;
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "删除失败");
}
return inInfo;
}
}
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC008.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC008;
import com.baosight.hpjx.hp.pz.domain.HPPZ004;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.StringUtil;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
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.hpjx.util.CommonMethod;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import org.apache.commons.collections.MapUtils;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -50,8 +45,8 @@ public class ServiceHPKC008 extends ServiceBase {
public EiInfo query(EiInfo inInfo) {
try {
Map queryRow = EiInfoUtils.getFirstRow(inInfo);
String receiptDate = MapUtils.getString(queryRow, "receiptDate");
queryRow.put("receiptDate", StringUtil.removeSpecifiedCharacter(receiptDate,
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);
......@@ -63,28 +58,27 @@ public class ServiceHPKC008 extends ServiceBase {
}
/**
* 新增操作.
* 新增操作
*
* @param inInfo
* @return
*/
@Override
public EiInfo insert(EiInfo inInfo) {
try {
CommonMethod.creatorInfo(inInfo, EiConstant.resultBlock);
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
Map resultRow = resultRows.get(i);
HPKC008 fKc008 = new HPKC008();
fKc008.fromMap(resultRows.get(i));
// 去除日期字符串中的-
String datemonth = MapUtils.getString(resultRow, "datemonth");
resultRow.put("datemonth", StringUtil.removeHorizontalLine(datemonth));
fKc008.setDateMonth(StringUtil.removeHorizontalLine(fKc008.getDateMonth()));
// 物料名称
Map params1 = new HashMap<>();
params1.put("inventCode", MapUtils.getString(resultRow, "materialCode"));
List query1 = dao.query("HPPZ004.query", params1);
String matName = ((HPPZ004) query1.get(0)).getInventName();
resultRow.put("materialName", matName);
fKc008.setInventName(HPPZTools.getPz004ByCode(fKc008.getInventCode()).getInventName());
// 计算总金额
fKc008.setTotalPrice(fKc008.getAmount().multiply(fKc008.getPrice()));
// 生成单据号
resultRow.put("statisticalNumber", SequenceGenerator.getNextSequence(
fKc008.setStatNo(SequenceGenerator.getNextSequence(
HPConstant.SequenceId.HPKC008_NUMBER));
DaoUtils.insert("HPKC008.insert", resultRow);
DaoUtils.insert(HPKC008.INSERT, fKc008);
}
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
} catch (Exception e) {
......@@ -93,56 +87,54 @@ public class ServiceHPKC008 extends ServiceBase {
return inInfo;
}
/**
* 修改操作.
* 修改操作
*
* @param inInfo
* @return
*/
public EiInfo update(EiInfo inInfo) {
try {
HPKC008 HPKC008 = new HPKC008();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i);
HPKC008.fromMap(map);
this.dao.update("HPKC008.update", HPKC008.toMap());
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
HPKC008 fKc008 = new HPKC008();
fKc008.fromMap(resultRows.get(i));
// 去除日期字符串中的-
fKc008.setDateMonth(StringUtil.removeHorizontalLine(fKc008.getDateMonth()));
// 物料名称
fKc008.setInventName(HPPZTools.getPz004ByCode(fKc008.getInventCode()).getInventName());
// 计算总金额
fKc008.setTotalPrice(fKc008.getAmount().multiply(fKc008.getPrice()));
DaoUtils.update(HPKC008.UPDATE, fKc008);
}
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsg("修改成功！");
} catch (PlatException e) {
inInfo.setStatus(EiConstant.STATUS_FAILURE);
inInfo.setMsg("操作失败！原因参见详细错误描述！");
inInfo.setDetailMsg(e.getMessage());
logError("修改失败", e.getMessage());
return inInfo;
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据修改成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "修改失败");
}
return query(inInfo);
return inInfo;
}
/**
* 删除操作.
* 删除操作
*
* @param inInfo
* @return
*/
public EiInfo delete(EiInfo eiInfo) {
HPKC008 HPKC008 = new HPKC008();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
public EiInfo delete(EiInfo inInfo) {
try {
for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i);
HPKC008.fromMap(map);
this.dao.delete("HPKC008.delete", HPKC008.toMap());
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
DaoUtils.update(HPKC008.DELETE, resultRows.get(i));
}
} catch (PlatException e) {
eiInfo.setStatus(EiConstant.STATUS_FAILURE);
eiInfo.setMsg("删除失败，原因参见详细错误描述！");
eiInfo.setDetailMsg(e.getMessage());
logError("删除失败！", e.getMessage());
return eiInfo;
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "删除失败");
}
eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("删除成功！");
return eiInfo;
return inInfo;
}
}
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC003.xml
......@@ -77,7 +77,7 @@
<insert id="insert">
INSERT INTO ${hpjxSchema}.T_HPKC003 (
COMPANY_CODE, <!-- 企业编码 预留 -->
DEPT_CODE, <!-- 部门编码 -->
DEP_CODE, <!-- 部门编码 -->
DOCUMENT_DATE, <!-- 单据日期 -->
PROD_NO, <!-- 生产入库单号 -->
WH_CODE, <!-- 仓库编码 -->
......@@ -92,7 +92,7 @@
CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME <!-- 创建时间 -->
) VALUES (
#companyCode#, #deptCode#, #documentDate#, #prodNo#, #whCode#, #whName#,
#companyCode#, #depCode#, #documentDate#, #prodNo#, #whCode#, #whName#,
#inventType#, #inventCode#, #inventName#, #amount#, #weight#, #remark#,
#createdBy#, #createdName#, #createdTime#
)
......@@ -106,7 +106,7 @@
UPDATE ${hpjxSchema}.T_HPKC003
SET
COMPANY_CODE = #companyCode#, <!-- 企业编码 预留 -->
DEPT_CODE = #deptCode#, <!-- 部门编码 -->
DEP_CODE = #depCode#, <!-- 部门编码 -->
DOCUMENT_DATE = #documentDate#, <!-- 单据日期 -->
PROD_NO = #prodNo#, <!-- 生产入库单号 -->
WH_CODE = #whCode#, <!-- 仓库编码 -->
......@@ -127,7 +127,7 @@
<select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC003">
SELECT
COMPANY_CODE AS "companyCode",
DEPT_CODE AS "deptCode",
DEP_CODE AS "depCode",
WH_CODE AS "whCode",
INVENT_TYPE AS "inventType",
INVENT_CODE AS "inventCode",
......@@ -138,7 +138,7 @@
<isNotEmpty prepend=" AND " property="createdTimeFrom">
CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
</isNotEmpty>
GROUP BY COMPANY_CODE, DEPT_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE
GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE
</select>
</sqlMap>
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC008.xml
......@@ -4,39 +4,50 @@
<sql id="column">
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
DATEMONTH as "datemonth", <!-- 月份 -->
STATISTICAL_NUMBER as "statisticalNumber", <!-- 统计单单号 -->
MATERIAL_CODE as "materialCode", <!-- 物料编码 -->
MATERIAL_NAME as "materialName", <!-- 物料名称 -->
COMPANY_CODE as "companyCode", <!-- 企业编码 -->
DEP_CODE as "depCode", <!-- 部门编码 -->
DATE_MONTH as "dateMonth", <!-- 月份 -->
STAT_NO as "statNo", <!-- 统计单号 -->
INVENT_CODE as "inventCode", <!-- 存货代码 -->
INVENT_NAME as "inventName", <!-- 存货名称 -->
UNIT as "unit", <!-- 单位 -->
AMOUNT as "amount", <!-- 数量 -->
PRICE as "price", <!-- 单价 -->
TOTAL_PRICE as "totalPrice", <!-- 金额 -->
NOTES as "notes", <!-- 备注 -->
TOTAL_PRICE as "totalPrice", <!-- 总价 -->
REMARK as "remark", <!-- 备注 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_NAME as "createdName", <!-- 创建人姓名 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_TIME as "updatedTime" <!-- 更新时间 -->
UPDATED_BY as "updatedBy", <!-- 修改人 -->
UPDATED_NAME as "updatedName", <!-- 修改人名称 -->
UPDATED_TIME as "updatedTime" <!-- 修改时间 -->
</sql>
<sql id="condition">
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="datemonth">
DATEMONTH = #datemonth#
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="statisticalNumber">
STATISTICAL_NUMBER = #statisticalNumber#
<isNotEmpty prepend=" AND " property="depCode">
DEP_CODE = #depCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="dateMonth">
DATE_MONTH = #dateMonth#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="statNo">
STAT_NO = #statNo#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventCode">
INVENT_CODE = #inventCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventName">
INVENT_NAME = #inventName#
</isNotEmpty>
</sql>
<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC008">
SELECT
<include refid="column"/>
FROM hpjx.t_hpkc008 WHERE 1=1
<include refid="condition"/>
<sql id="order">
<dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy">
$orderBy$
......@@ -45,13 +56,19 @@
ID DESC
</isEmpty>
</dynamic>
</sql>
<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC008">
SELECT
<include refid="column"/>
FROM ${hpjxSchema}.T_HPKC008 WHERE 1=1
<include refid="condition"/>
<include refid="order"/>
</select>
<select id="count" resultClass="int">
SELECT COUNT(*) FROM hpjx.t_hpkc008 WHERE 1=1
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
SELECT COUNT(*) FROM ${hpjxSchema}.T_HPKC008 WHERE 1=1
<include refid="condition"/>
</select>
<!-- 查询统计 -->
......@@ -59,20 +76,31 @@
SELECT
COALESCE(SUM(AMOUNT), 0) AS "amount", <!-- 数量 -->
COALESCE(SUM(TOTAL_PRICE), 0) AS "totalPrice" <!-- 金额 -->
FROM ${hpjxSchema}.t_hpkc008
FROM ${hpjxSchema}.T_HPKC008
WHERE 1=1
<include refid="condition"/>
</select>
<insert id="insert">
INSERT INTO hpjx.t_hpkc008 (
COMPANY_CODE, DATEMONTH, STATISTICAL_NUMBER, MATERIAL_CODE,
MATERIAL_NAME, UNIT, AMOUNT, PRICE, TOTAL_PRICE, NOTES,
CREATED_BY, CREATED_TIME
COMPANY_CODE, <!-- 企业编码 -->
DEP_CODE, <!-- 部门编码 -->
DATE_MONTH, <!-- 月份 -->
STAT_NO, <!-- 统计单号 -->
INVENT_CODE, <!-- 存货代码 -->
INVENT_NAME, <!-- 存货名称 -->
UNIT, <!-- 单位 -->
AMOUNT, <!-- 数量 -->
PRICE, <!-- 单价 -->
TOTAL_PRICE, <!-- 总价 -->
REMARK, <!-- 备注 -->
CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人姓名 -->
CREATED_TIME <!-- 创建时间 -->
) VALUES (
#companyCode#, #datemonth#, #statisticalNumber#, #materialCode#, #materialName#,
#unit#, #amount#, #price#, #totalPrice#, #notes#, #createdBy#, #createdTime#,
#updatedBy#, #updatedTime#
#companyCode#, #depCode#, #dateMonth#, #statNo#, #inventCode#, #inventName#,
#unit#, #amount#, #price#, #totalPrice#, #remark#, #createdBy#, #createdName#,
#createdTime#
)
</insert>
......@@ -83,16 +111,17 @@
<update id="update">
UPDATE hpjx.t_hpkc008
SET
DATEMONTH = #datemonth#, <!-- 月份 -->
MATERIAL_CODE = #materialCode#, <!-- 物料编码 -->
MATERIAL_NAME = #materialName#, <!-- 物料名称 -->
DATE_MONTH = #dateMonth#, <!-- 月份 -->
INVENT_CODE = #inventCode#, <!-- 存货代码 -->
INVENT_NAME = #inventName#, <!-- 存货名称 -->
UNIT = #unit#, <!-- 单位 -->
AMOUNT = #amount#, <!-- 数量 -->
PRICE = #price#, <!-- 单价 -->
TOTAL_PRICE = #totalPrice#, <!-- 金额 -->
NOTES = #notes#, <!-- 备注 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 -->
TOTAL_PRICE = #totalPrice#, <!-- 总价 -->
REMARK = #remark#, <!-- 备注 -->
UPDATED_BY = #updatedBy#, <!-- 修改人 -->
UPDATED_NAME = #updatedName#, <!-- 修改人名称 -->
UPDATED_TIME = #updatedTime# <!-- 修改时间 -->
WHERE ID = #id#
</update>
......
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java
package com.baosight.hpjx.hp.zl.service;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
......@@ -12,13 +13,14 @@ import com.baosight.hpjx.util.StringUtil;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
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.ed.util.SequenceGenerator;
import org.apache.commons.collections.MapUtils;
import java.util.*;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author ZJH
......@@ -62,22 +64,21 @@ public class ServiceHPZL001 extends ServiceBase {
@Override
public EiInfo insert(EiInfo inInfo) {
try {
CommonMethod.creatorInfo(inInfo, EiConstant.resultBlock);
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
Map resultRow = resultRows.get(i);
HPZL001 fZl001 = new HPZL001();
fZl001.fromMap(resultRows.get(i));
// 去除日期字符串中的-
String datemonth = MapUtils.getString(resultRow, "receiptDate");
resultRow.put("datemonth", StringUtil.removeHorizontalLine(datemonth));
fZl001.setReceiptDate(StringUtil.removeHorizontalLine(fZl001.getReceiptDate()));
// 项目名称
Map params1 = new HashMap<>();
params1.put("itemCode", MapUtils.getString(resultRow, "itemCode"));
params1.put("itemCode", fZl001.getItemCode());
List<THPSC001> query1 = dao.query("HPSC001.query", params1);
resultRow.put("itemName", query1.get(0).getProjName());
fZl001.setItemName(query1.get(0).getProjName());
// 生成单据号
resultRow.put("chkBillno", SequenceGenerator.getNextSequence(
fZl001.setChkBillno(SequenceGenerator.getNextSequence(
HPConstant.SequenceId.HPZL001_NUMBER));
DaoUtils.insert("HPZL001.insert", resultRow);
DaoUtils.insert("HPZL001.insert", fZl001);
}
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
} catch (Exception e) {
......@@ -86,75 +87,103 @@ public class ServiceHPZL001 extends ServiceBase {
return inInfo;
}
/**
* 修改操作.
* 修改操作
*
* @param inInfo
* @return
*/
public EiInfo update(EiInfo inInfo) {
try {
HPZL001 HPZL001 = new HPZL001();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
for (int i = 0; i < eiBlock.getRowCount(); i++) {
String itemName =inInfo.getCellStr(EiConstant.resultBlock,i,"itemName");
String[] str = itemName.split("-");
inInfo.setCell(EiConstant.resultBlock,i,"itemCode", str[0]);
inInfo.setCell(EiConstant.resultBlock,i,"itemName", str[1]);
String receiptDate = inInfo.getCellStr(EiConstant.resultBlock,i,"receiptDate");
inInfo.setCell(EiConstant.resultBlock,i,"receiptDate", StringUtil.removeHorizontalLine(receiptDate));
Map<?, ?> map = eiBlock.getRow(i);
HPZL001.fromMap(map);
this.dao.update("HPZL001.update", HPZL001.toMap());
}
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsg("修改成功！");
} catch (PlatException e) {
inInfo.setStatus(EiConstant.STATUS_FAILURE);
inInfo.setMsg("操作失败！原因参见详细错误描述！");
inInfo.setDetailMsg(e.getMessage());
logError("修改失败", e.getMessage());
return inInfo;
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
HPZL001 fZl001 = new HPZL001();
fZl001.fromMap(resultRows.get(i));
// 去除日期字符串中的-
fZl001.setReceiptDate(StringUtil.removeHorizontalLine(fZl001.getReceiptDate()));
// 项目名称
Map params1 = new HashMap<>();
params1.put("itemCode", fZl001.getItemCode());
List<THPSC001> query1 = dao.query("HPSC001.query", params1);
fZl001.setItemName(query1.get(0).getProjName());
DaoUtils.update("HPZL001.update", fZl001);
}
return query(inInfo);
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据修改成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "修改失败");
}
return inInfo;
}
/**
* 删除操作.
* 删除操作
*
* @param inInfo
* @return
*/
public EiInfo delete(EiInfo eiInfo) {
HPZL001 HPZL001 = new HPZL001();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
public EiInfo delete(EiInfo inInfo) {
try {
for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i);
HPZL001.fromMap(map);
this.dao.delete("HPZL001.delete", HPZL001.toMap());
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
DaoUtils.update("HPZL001.delete", resultRows.get(i));
}
} catch (PlatException e) {
eiInfo.setStatus(EiConstant.STATUS_FAILURE);
eiInfo.setMsg("删除失败，原因参见详细错误描述！");
eiInfo.setDetailMsg(e.getMessage());
logError("删除失败！", e.getMessage());
return eiInfo;
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "删除失败");
}
return inInfo;
}
eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("删除成功！");
return eiInfo;
/**
* 审核操作
*
* @param inInfo
* @return
*/
public EiInfo audit(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
HPZL001 fZl001 = new HPZL001();
fZl001.fromMap(resultRows.get(i));
fZl001.setStatus(1);
DaoUtils.update("HPZL001.operator", fZl001);
}
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据审核成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "审核失败");
}
return inInfo;
}
/**
* 审核操作.
* 反审操作
*
* @param inInfo
* @return
*/
public EiInfo operator(EiInfo inInfo) {
HPZL001 HPZL001 = new HPZL001();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
CommonMethod.updateuserInfo(inInfo, EiConstant.resultBlock);
return super.update(inInfo, "HPZL001.operator");
public EiInfo unAudit(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
HPZL001 fZl001 = new HPZL001();
fZl001.fromMap(resultRows.get(i));
fZl001.setStatus(0);
DaoUtils.update("HPZL001.operator", fZl001);
}
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据反审成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "审核失败");
}
return inInfo;
}
/**
......
src/main/webapp/HP/KC/HPKC003.jsp
......@@ -23,7 +23,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="prodNo" cname="生产入库单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="documentDate" cname="单据日期" width="100" align="center" editType="date"
......
src/main/webapp/HP/KC/HPKC004.jsp
......@@ -23,7 +23,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="saleNo" cname="销售出库单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" width="100" align="center" editType="date"
......
src/main/webapp/HP/KC/HPKC005.jsp
......@@ -28,7 +28,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="statisticalNumber" cname="盘点单号" enable="false" width="130" algin="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
......@@ -38,13 +38,13 @@
<EF:EFOption label="0-待审核" value="0"></EF:EFOption>
<EF:EFOption label="1-已审核" value="1"></EF:EFOption>
</EF:EFComboColumn>--%>
<EF:EFComboColumn ename="whCode" cname="仓库编码" columnTemplate="#=textField#"
<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
itemTemplate="#=textField#" blockName="wh_record_block_id"
textField="textField" valueField="valueField"
align="center" filter="contains" width="100">
align="center" filter="contains">
</EF:EFComboColumn>
<EF:EFComboColumn ename="inventType" cname="存货类型" width="90" align="center">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn>
<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center"/>
<EF:EFColumn ename="spec" cname="规格" width="120" align="center"/>
......@@ -56,16 +56,16 @@
sumType="all"/>
<EF:EFColumn ename="entityWeight" cname="实物重量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all"/>
<EF:EFColumn ename="diffAmount" cname="差异数量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all"/>
<EF:EFColumn ename="diffWeight" cname="差异重量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all"/>
<EF:EFColumn ename="diffAmount" cname="差异数量" enable="false" format="{0:N3}" maxLength="20" width="100"
align="right" sumType="all"/>
<EF:EFColumn ename="diffWeight" cname="差异重量" enable="false" format="{0:N3}" maxLength="20" width="100"
align="right" sumType="all"/>
<EF:EFColumn ename="notes" cname="备注" width="100"/>
<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
</EF:EFGrid>
<p class="text-info"><span style='color: red;'>注：差异数量=实物数量-账面数量；差异重量=实物重量-账面重量 </span></p>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HP/KC/HPKC008.js
$(function() {
// $("#inqu_status-0-receiptDate").val(__eiInfo.blocks.inqu_status.rows[0]);
// 查询
$("#QUERY").on("click", function () {
resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
});
$("#QUERY").on("click", query);
IPLATUI.EFGrid = {
result:{
IPLATUI.EFGrid.result = {
pageable: {
pageSize: 20,
pageSizes: [10, 20, 30, 50, 100, 200],
},
columns: [{
field: "datemonth",
attributes: {
'class': 'i-input-readonly',
required: true
}
}]
pageSizes: [10, 20, 30, 50, 100, 200]
}
}
});
/**
* 页面加载时执行
*/
$(window).load(function () {
// 查询
query();
});
/**
* 查询
*/
let query = function () {
resultGrid.dataSource.page(1);
}
src/main/webapp/HP/KC/HPKC008.jsp
......@@ -8,32 +8,38 @@
<EF:EFPage title="数据统计单">
<EF:EFRegion id="inqu" title="查询条件">
<div class="row">
<EF:EFDatePicker ename="inqu_status-0-datemonth" cname="单据日期"
<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-dateMonth" colWidth="3"
format="yyyy-MM" start="year" depth="year" readonly="true" required="true"/>
<EF:EFInput ename="inqu_status-0-statisticalNumber" cname="统计单单号" colWidth="4" readonly="false"/>
<EF:EFInput cname="统计单单号" ename="inqu_status-0-statNo" colWidth="3"/>
<EF:EFSelect ename="inqu_status-0-inventCode" cname="存货名称" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="请选择" value=""/>
<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" autoFit="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="statisticalNumber" cname="统计单单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="datemonth" cname="月份" editType="date" dateFormat="yyyy-MM" parseFormats="['yyyyMM']"
start="year" depth="year" width="100" align="center"/>
<EF:EFComboColumn ename="materialCode" cname="存货名称" width="120" align="center">
<EF:EFColumn ename="statNo" cname="统计单单号" enable="false" width="140" align="center"/>
<EF:EFColumn ename="dateMonth" cname="月份" width="100" align="center" editType="date"
dateFormat="yyyy-MM" parseFormats="['yyyyMM']" start="year" depth="year" required="true"/>
<EF:EFComboColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true">
<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn>
<EF:EFColumn ename="unit" cname="单位" width="100" align="center" maxLength="2"/>
<EF:EFColumn ename="amount" cname="数量" width="100" align="right" format="{0:N3}" sumType="all"/>
<EF:EFColumn ename="price" cname="单价" width="100" align="right" format="{0:C3}"/>
<EF:EFColumn ename="totalPrice" cname="金额" width="100" align="right" format="{0:C3}" sumType="all"/>
<EF:EFColumn ename="notes" cname="备注" width="100" readonly="false"/>
<EF:EFColumn ename="createdTime" cname="创建时间" readonly="true" width="150" align="center" enable="false"
<EF:EFColumn ename="amount" cname="数量" width="120" align="right" format="{0:N3}" sumType="all"
required="true"/>
<EF:EFColumn ename="price" cname="单价" width="120" align="right" format="{0:C3}" required="true"/>
<EF:EFColumn ename="totalPrice" cname="金额" enable="false" width="120" align="right" format="{0:C3}"
sumType="all"/>
<EF:EFColumn ename="remark" cname="备注" width="150" readonly="false"/>
<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>
<EF:EFColumn ename="createdBy" cname="创建人" readonly="true" width="150" align="center" enable="false"/>
<EF:EFColumn ename="updatedTime" cname="更新时间" readonly="true" width="150" align="center" enable="false"
<EF:EFColumn ename="updatedName" cname="更新人名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="updatedTime" cname="更新时间" enable="false" width="140" align="center"
parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>
<EF:EFColumn ename="updatedBy" cname="更新人" readonly="true" width="150" align="center" enable="false"/>
</EF:EFGrid>
</EF:EFRegion>
......
src/main/webapp/HP/PZ/HPPZ002.jsp
......@@ -23,7 +23,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="custCode" cname="供应商编码" enable="false" width="100" align="center"/>
<EF:EFColumn ename="custName" cname="供应商名称" width="100" required="true"/>
......
src/main/webapp/HP/PZ/HPPZ003.jsp
......@@ -23,7 +23,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="记录集">
<EF:EFGrid blockId="result" autoDraw="override">
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="custCode" cname="客户编码" enable="false" width="100" align="center"/>
<EF:EFComboColumn ename="custType" cname="客户类型" width="100" align="center"
......
src/main/webapp/HP/PZ/HPPZ004.jsp
......@@ -23,7 +23,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
<EF:EFColumn ename="inventName" cname="存货名称" width="120" required="true"/>
......
src/main/webapp/HP/PZ/HPPZ006.jsp
......@@ -13,7 +13,7 @@
<EF:EFOption label="请选择" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-inventCode" cname="存货名称" colWidth="3" filter="contains">
<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>
......@@ -25,7 +25,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
......@@ -55,5 +55,4 @@
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HP/PZ/HPPZ007.jsp
......@@ -22,7 +22,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="记录集">
<EF:EFGrid blockId="result" autoDraw="no">
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"/>
<EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" required="true"/>
......
src/main/webapp/HP/PZ/HPPZ008.jsp
......@@ -20,7 +20,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="记录集">
<EF:EFGrid blockId="result" autoDraw="no">
<EF:EFGrid blockId="result" autoDraw="no" >
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="whType" required='true' cname="仓库类型"/>
<EF:EFColumn ename="whCode" required='true' cname="仓库编码"/>
......
src/main/webapp/HP/PZ/HPPZ009.jsp
......@@ -14,7 +14,7 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="记录集">
<EF:EFGrid blockId="result" autoDraw="override">
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn cname="企业编码" ename="companyCode" enable="false" width="120" align="center"/>
<EF:EFColumn cname="企业名称" ename="companyName" width="140" editType="textarea" required="true"/>
......
src/main/webapp/HP/ZL/HPZL001.js
let rowId;
$(function() {
// var day1 = new Date();
// day1.setTime(day1.getTime());
// day1.setDate(day1.getDate()-1);
// var month = day1.getMonth() + 1;
// var year = day1.getFullYear();
// var day = day1.getDate();
// let inqu = $("#inqu")
// ,result = $("#result")
// ,from = $("#from")
// ,receiptDate = $("#inqu_status-0-receiptDate");
// receiptDate.val(year+"-"+month+"-"+day)
//
// $("#inqu_status-0-receiptDate").val(year+"-"+month+"-"+day);
// 查询
$("#QUERY").on("click", function () {
resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
......@@ -48,10 +34,10 @@ $(function() {
let auditStatus = item.status;
if (auditStatus == 0) {
return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
'onclick="audit(' + item.id + ',\'' + chkBillno + '\',1)" >审核</a>';
'onclick="audit(' + item.id + ',\'' + chkBillno + '\')" >审核</a>';
} else {
return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
'onclick="audit(' + item.id + ',\'' + chkBillno + '\',0)" >反审</a>';
'onclick="unAudit(' + item.id + ',\'' + chkBillno + '\')" >反审</a>';
}
}
}]
......@@ -100,26 +86,27 @@ function openUploadFile(id) {
* @param chkBillno
* @param auditStatus
*/
function audit(id, chkBillno, auditStatus) {
let message = "确认对单号[" + chkBillno + "]进行" + (auditStatus == 1 ? "审核" : "反审") + "操作吗? ";
function audit(id, chkBillNo) {
let message = "确认对单号[" + chkBillNo + "]进行审核操作吗? ";
JSUtils.confirm(message, {
ok: function () {
const inEiInfo = new EiInfo();
inEiInfo.set("result-0-id", id);
inEiInfo.set("result-0-status", auditStatus);
EiCommunicator.send('HPZL001', 'operator', inEiInfo, {
onSuccess(response) {
NotificationUtil(response.msg);
if(response.status >= 0){
resultGrid.dataSource.page(1);
}
},
onFail(errorMessage, status, e) {
NotificationUtil("执行失败！", "error");
JSUtils.submitGridsData("result", "HPZL001", "audit", true);
}
}, {
async: false
});
}
/**
* 反审操作
*
* @param id
* @param chkBillno
* @param auditStatus
*/
function unAudit(id, chkBillNo) {
let message = "确认对单号[" + chkBillNo + "]进行反审操作吗? ";
JSUtils.confirm(message, {
ok: function () {
JSUtils.submitGridsData("result", "HPZL001", "unAudit", true);
}
});
}
src/main/webapp/HP/ZL/HPZL001.jsp
......@@ -27,22 +27,20 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="chkBillno" cname="检查单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
parseFormats="['yyyyMMdd']" width="120" readonly="false"/>
<EF:EFComboColumn ename="itemCode" cname="项目名称" columnTemplate="#=textField#"
<EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFComboColumn ename="itemCode" cname="项目名称" width="140" columnTemplate="#=textField#"
itemTemplate="#=textField#" blockName="proj_record_block_id"
textField="textField" valueField="valueField" maxLength="20"
readonly="false" style="color:blue;" required="true" filter="contains" width="220">
required="true" filter="contains">
</EF:EFComboColumn>
<EF:EFColumn ename="unit" cname="生产组" width="100" readonly="false"/>
<EF:EFColumn ename="notes" cname="质量问题描述" width="100" readonly="false"/>
<EF:EFColumn ename="princ" cname="检查人" width="100" readonly="true"/>
<EF:EFComboColumn ename="status" cname="状态" enable="false" align="center"
columnTemplate="#=valueField#-#=textField#"
itemTemplate="#=valueField#-#=textField#" textField="textField"
<EF:EFComboColumn ename="status" cname="状态" enable="false" align="center" textField="textField"
valueField="valueField" width="100" required="true" optionLabel=" ">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="审核" value="1"></EF:EFOption>
......
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