Skip to content

H
hg-smart
Commit 061a02bb by liuyang
Options

2024-09-30 委外入库单和委外加工添加字段

parent 338f1452
Showing with 438 additions and 19 deletions
src/main/java/com/baosight/hggp/hg/kc/constant/HgKcSqlConstant.java 0 → 100644
package com.baosight.hggp.hg.kc.constant;
/**
* @author LiuYang
* @version 1.0 2024/9/30
* @description 自定义SQL
*/
public class HgKcSqlConstant {
public static class HgKc014 {
// 模块名称：HGCW003
private static final String MODULE_NAME = "HGKC014.";
public static final String UPDATE_STATUS = MODULE_NAME+"updateByStatus";
}
/**
* HGKC014A SQL定义
*
*/
public static class HgKc014a {
// 模块名称：HGCW003
private static final String MODULE_NAME = "HGKC014A.";
// 父级删除
public static final String DELETE_BY_PARENT_ID = MODULE_NAME+"deleteByParentId";
public static final String UPDATE_STATUS = MODULE_NAME+"Status";
}
}
src/main/java/com/baosight/hggp/hg/kc/domain/HGKC014A.java
......@@ -34,16 +34,22 @@ public class HGKC014A extends DaoEPBase {
public static final String FIELD_DELETE_FLAG = "deleteFlag"; /* 是否删除 0-否1-是*/
public static final String FIELD_COMPANY_CODE = "companyCode"; /* 公司编码*/
public static final String FIELD_COMPANY_NAME = "companyName"; /* 公司名称*/
public static final String FIELD_WH_CODE = "whCode"; /* 仓库编码*/
public static final String FIELD_WH_NAME = "whName"; /* 仓库名称*/
public static final String FIELD_PARENT_ID = "parentId"; /* 委托ID*/
public static final String FIELD_CONTRACT_CODE = "contractCode"; /* 委托单号*/
public static final String FIELD_DEPOSIT_CODE = "depositCode"; /* 委托入库单号*/
public static final String FIELD_INVENT_TYPE = "inventType"; /* 存货类型*/
public static final String FIELD_PRODUCT_CODE = "productCode"; /* 成品编码*/
public static final String FIELD_PRODUCT_NAME = "productName"; /* 成品名称*/
public static final String FIELD_SPEC_ID = "specId"; /* 规格*/
public static final String FIELD_SPEC = "spec"; /* 规格*/
public static final String FIELD_UNIT = "unit"; /* 单位*/
public static final String FIELD_DEPOSIT_QTY = "depositQty"; /* 入库数量*/
public static final String FIELD_DEPOSIT_UNIT_WEIGHT = "depositUnitWeight"; /* 入库单量*/
public static final String FIELD_DEPOSIT_WEIGHT = "depositWeight"; /* 入库重量*/
public static final String FIELD_DELIVER_QTY = "deliverQty"; /* 退货数量*/
public static final String FIELD_ACTUAL_QTY = "actualQty"; /* 实际入库数量*/
public static final String COL_ID = "ID"; /* ID*/
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 账套*/
......@@ -85,16 +91,22 @@ public class HGKC014A extends DaoEPBase {
private Integer deleteFlag = 0; /* 是否删除 0-否1-是*/
private String companyCode = " "; /* 公司编码*/
private String companyName = " "; /* 公司名称*/
private String whCode = " "; /* 仓库编码*/
private String whName = " "; /* 仓库名称*/
private Long parentId = new Long(0); /* 委托ID*/
private String contractCode = " "; /* 委托单号*/
private String depositCode = " "; /* 委托入库单号*/
private String inventType = " "; /* 存货类型*/
private String productCode = " "; /* 成品编码*/
private String productName = " "; /* 成品名称*/
private String specId = " "; /* 规格ID*/
private String spec = " "; /* 规格*/
private String unit = " "; /* 单位*/
private BigDecimal depositQty = new BigDecimal("0"); /* 入库数量*/
private BigDecimal depositUnitWeight = new BigDecimal("0"); /* 入库单重*/
private BigDecimal depositWeight = new BigDecimal("0"); /* 入库重量*/
private BigDecimal deliverQty = new BigDecimal("0"); /* 退货数量*/
private BigDecimal actualQty = new BigDecimal("0"); /* 实际入库数量*/
/**
* initialize the metadata.
......@@ -151,6 +163,14 @@ public class HGKC014A extends DaoEPBase {
eiColumn.setDescName("公司名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_WH_CODE);
eiColumn.setDescName("仓库编码");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_WH_NAME);
eiColumn.setDescName("仓库名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PARENT_ID);
eiColumn.setDescName("委托ID");
eiMetadata.addMeta(eiColumn);
......@@ -175,6 +195,10 @@ public class HGKC014A extends DaoEPBase {
eiColumn.setDescName("成品名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC_ID);
eiColumn.setDescName("规格ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC);
eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn);
......@@ -190,6 +214,13 @@ public class HGKC014A extends DaoEPBase {
eiColumn.setDescName("入库数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEPOSIT_UNIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(17);
eiColumn.setDescName("入库单重");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEPOSIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
......@@ -197,7 +228,19 @@ public class HGKC014A extends DaoEPBase {
eiColumn.setDescName("入库重量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELIVER_QTY);
eiColumn.setType("N");
eiColumn.setScaleLength(0);
eiColumn.setFieldLength(20);
eiColumn.setDescName("退货数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_ACTUAL_QTY);
eiColumn.setType("N");
eiColumn.setScaleLength(0);
eiColumn.setFieldLength(20);
eiColumn.setDescName("实际入库数量");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -552,6 +595,54 @@ public class HGKC014A extends DaoEPBase {
this.depositCode = depositCode;
}
public String getWhCode() {
return whCode;
}
public void setWhCode(String whCode) {
this.whCode = whCode;
}
public String getWhName() {
return whName;
}
public void setWhName(String whName) {
this.whName = whName;
}
public String getSpecId() {
return specId;
}
public void setSpecId(String specId) {
this.specId = specId;
}
public BigDecimal getDepositUnitWeight() {
return depositUnitWeight;
}
public void setDepositUnitWeight(BigDecimal depositUnitWeight) {
this.depositUnitWeight = depositUnitWeight;
}
public BigDecimal getDeliverQty() {
return deliverQty;
}
public void setDeliverQty(BigDecimal deliverQty) {
this.deliverQty = deliverQty;
}
public BigDecimal getActualQty() {
return actualQty;
}
public void setActualQty(BigDecimal actualQty) {
this.actualQty = actualQty;
}
/**
* get the value from Map.
*
......@@ -572,16 +663,22 @@ public class HGKC014A extends DaoEPBase {
setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
setParentId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PARENT_ID)), parentId));
setContractCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_CODE)), contractCode));
setDepositCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_CODE)), depositCode));
setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
setProductCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_CODE)), productCode));
setProductName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_NAME)), productName));
setSpecId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SPEC_ID)), specId));
setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SPEC)), spec));
setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UNIT)), unit));
setDepositQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_QTY)), depositQty));
setDepositUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_UNIT_WEIGHT)), depositUnitWeight));
setDepositWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_WEIGHT)), depositWeight));
setDeliverQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DELIVER_QTY)), deliverQty));
setActualQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_QTY)), actualQty));
}
/**
......@@ -603,16 +700,22 @@ public class HGKC014A extends DaoEPBase {
map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME)));
map.put(FIELD_PARENT_ID, StringUtils.toString(parentId, eiMetadata.getMeta(FIELD_PARENT_ID)));
map.put(FIELD_CONTRACT_CODE, StringUtils.toString(contractCode, eiMetadata.getMeta(FIELD_CONTRACT_CODE)));
map.put(FIELD_DEPOSIT_CODE, StringUtils.toString(depositCode, eiMetadata.getMeta(FIELD_DEPOSIT_CODE)));
map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
map.put(FIELD_PRODUCT_CODE, StringUtils.toString(productCode, eiMetadata.getMeta(FIELD_PRODUCT_CODE)));
map.put(FIELD_PRODUCT_NAME, StringUtils.toString(productName, eiMetadata.getMeta(FIELD_PRODUCT_NAME)));
map.put(FIELD_SPEC_ID, StringUtils.toString(specId, eiMetadata.getMeta(FIELD_SPEC_ID)));
map.put(FIELD_SPEC, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_SPEC)));
map.put(FIELD_UNIT, StringUtils.toString(unit, eiMetadata.getMeta(FIELD_UNIT)));
map.put(FIELD_DEPOSIT_QTY, StringUtils.toString(depositQty, eiMetadata.getMeta(FIELD_DEPOSIT_QTY)));
map.put(FIELD_DEPOSIT_UNIT_WEIGHT, StringUtils.toString(depositUnitWeight, eiMetadata.getMeta(FIELD_DEPOSIT_UNIT_WEIGHT)));
map.put(FIELD_DEPOSIT_WEIGHT, StringUtils.toString(depositWeight, eiMetadata.getMeta(FIELD_DEPOSIT_WEIGHT)));
map.put(FIELD_DELIVER_QTY, StringUtils.toString(deliverQty, eiMetadata.getMeta(FIELD_DELIVER_QTY)));
map.put(FIELD_ACTUAL_QTY, StringUtils.toString(actualQty, eiMetadata.getMeta(FIELD_ACTUAL_QTY)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC014B.java
......@@ -96,6 +96,8 @@ public class ServiceHGKC014B extends ServiceEPBase {
hgkc014a.setParentId(Long.parseLong(paramMap.get("parentId").toString()));
hgkc014a.setCompanyCode(paramMap.get("companyCode").toString());
hgkc014a.setCompanyName(paramMap.get("companyName").toString());
hgkc014a.setWhCode(paramMap.get("whCode").toString());
hgkc014a.setWhName(paramMap.get("whName").toString());
hgkc014a.setDepositCode(paramMap.get("depositCode").toString());
this.add(hgkc014a);
}
......
src/main/java/com/baosight/hggp/hg/kc/sql/HGKC014.xml
......@@ -111,7 +111,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
DEPOSIT_DATE desc, ID desc
</isEmpty>
</dynamic>
......
src/main/java/com/baosight/hggp/hg/kc/sql/HGKC014A.xml
......@@ -65,6 +65,12 @@
<isNotEmpty prepend=" AND " property="companyName">
COMPANY_NAME = #companyName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="whCode">
WH_CODE = #whCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="whName">
WH_NAME = #whName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="parentId">
PARENT_ID = #parentId#
</isNotEmpty>
......@@ -83,6 +89,9 @@
<isNotEmpty prepend=" AND " property="productName">
PRODUCT_NAME = #productName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="specId">
SPEC_ID = #specId#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="spec">
SPEC = #spec#
</isNotEmpty>
......@@ -118,16 +127,22 @@
DELETE_FLAG as "deleteFlag", <!-- 是否删除 0-否1-是 -->
COMPANY_CODE as "companyCode", <!-- 公司编码 -->
COMPANY_NAME as "companyName", <!-- 公司名称 -->
WH_CODE as "whCode", <!-- 仓库编码 -->
WH_NAME as "whName", <!-- 仓库名称 -->
PARENT_ID as "parentId", <!-- 委托ID -->
CONTRACT_CODE as "contractCode", <!-- 委托单号 -->
DEPOSIT_CODE as "depositCode", <!-- 委托入库单号 -->
INVENT_TYPE as "inventType", <!-- 存货类型 -->
PRODUCT_CODE as "productCode", <!-- 成品编码 -->
PRODUCT_NAME as "productName", <!-- 成品名称 -->
SPEC_ID as "specId",
SPEC as "spec", <!-- 规格 -->
UNIT as "unit", <!-- 单位 -->
DEPOSIT_QTY as "depositQty", <!-- 入库数量 -->
DEPOSIT_WEIGHT as "depositWeight" <!-- 入库重量 -->
DEPOSIT_UNIT_WEIGHT as "depositUnitWeight", <!-- 入库单重 -->
DEPOSIT_WEIGHT as "depositWeight", <!-- 入库重量 -->
DELIVER_QTY as "deliverQty",
ACTUAL_QTY as "actualQty"
FROM ${hggpSchema}.HGKC014A WHERE 1=1
<include refid="condition" />
<dynamic prepend="ORDER BY">
......@@ -225,18 +240,27 @@
DELETE_FLAG, <!-- 是否删除 0-否1-是 -->
COMPANY_CODE, <!-- 公司编码 -->
COMPANY_NAME, <!-- 公司名称 -->
WH_CODE, <!-- 公司编码 -->
WH_NAME, <!-- 公司名称 -->
PARENT_ID, <!-- 委托ID -->
CONTRACT_CODE, <!-- 委托单号 -->
DEPOSIT_CODE,
INVENT_TYPE, <!-- 存货类型 -->
PRODUCT_CODE, <!-- 成品编码 -->
PRODUCT_NAME, <!-- 成品名称 -->
SPEC_ID, <!-- 规格 -->
SPEC, <!-- 规格 -->
UNIT, <!-- 单位 -->
DEPOSIT_QTY, <!-- 入库数量 -->
DEPOSIT_WEIGHT <!-- 入库重量 -->
DEPOSIT_UNIT_WEIGHT ,
DEPOSIT_WEIGHT, <!-- 入库重量 -->
DELIVER_QTY,
ACTUAL_QTY
)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #parentId#, #contractCode#, #depositCode#,#inventType#, #productCode#, #productName#, #spec#, #unit#, #depositQty#, #depositWeight#)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
#updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #whCode#, #whName#, #parentId#, #contractCode#,
#depositCode#,#inventType#, #productCode#, #productName#, #specId#, #spec#, #unit#, #depositQty#, #depositUnitWeight#, #depositWeight#,
#deliverQty#, #actualQty#)
</insert>
<delete id="delete">
......@@ -253,27 +277,28 @@
<update id="update">
UPDATE ${hggpSchema}.HGKC014A
SET
ACCOUNT_CODE = #accountCode#, <!-- 账套 -->
DEP_CODE = #depCode#, <!-- 部门编码 -->
CREATED_BY = #createdBy#, <!-- 创建人 -->
CREATED_NAME = #createdName#, <!-- 创建人名称 -->
CREATED_TIME = #createdTime#, <!-- 创建时间 -->
UPDATED_BY = #updatedBy#, <!-- 修改人 -->
UPDATED_NAME = #updatedName#, <!-- 修改人名称 -->
UPDATED_TIME = #updatedTime#, <!-- 修改时间 -->
DELETE_FLAG = #deleteFlag#, <!-- 是否删除 0-否1-是 -->
COMPANY_CODE = #companyCode#, <!-- 公司编码 -->
COMPANY_NAME = #companyName#, <!-- 公司名称 -->
WH_CODE = #whCode#,
WH_NAME = #whName#,
PARENT_ID = #parentId#, <!-- 委托ID -->
CONTRACT_CODE = #contractCode#, <!-- 委托单号 -->
DEPOSIT_CODE = #depositCode#,
INVENT_TYPE = #inventType#, <!-- 存货类型 -->
PRODUCT_CODE = #productCode#, <!-- 成品编码 -->
PRODUCT_NAME = #productName#, <!-- 成品名称 -->
SPEC_ID = #specId#,
SPEC = #spec#, <!-- 规格 -->
UNIT = #unit#, <!-- 单位 -->
DEPOSIT_QTY = #depositQty#, <!-- 入库数量 -->
DEPOSIT_WEIGHT = #depositWeight# <!-- 入库重量 -->
DEPOSIT_UNIT_WEIGHT = #depositUnitWeight#,
DEPOSIT_WEIGHT = #depositWeight#, <!-- 入库重量 -->
DELIVER_QTY = #deliverQty#,
ACTUAL_QTY = #actualQty#
WHERE
ID = #id#
</update>
......
src/main/java/com/baosight/hggp/hg/sc/domain/HGSC010A.java
......@@ -39,13 +39,17 @@ public class HGSC010A extends DaoEPBase {
public static final String FIELD_INVENT_TYPE = "inventType"; /* 存货类型*/
public static final String FIELD_PRODUCT_CODE = "productCode"; /* 成品编码*/
public static final String FIELD_PRODUCT_NAME = "productName"; /* 成品名称*/
public static final String FIELD_SPEC_ID = "specId"; /* 规格Id*/
public static final String FIELD_SPEC = "spec"; /* 规格*/
public static final String FIELD_UNIT = "unit"; /* 单位*/
public static final String FIELD_PCS_QTY = "pcsQty"; /* 加工数量*/
public static final String FIELD_PCS_UNIT_WEIGHT = "pcsUnitWeight"; /* 加工单重*/
public static final String FIELD_PCS_WEIGHT = "pcsWeight"; /* 加工重量*/
public static final String FIELD_DEPOSIT_QTY = "depositQty"; /* 入库数量*/
public static final String FIELD_DEPOSIT_UNIT_WEIGHT = "depositUnitWeight"; /* 入库单重*/
public static final String FIELD_DEPOSIT_WEIGHT = "depositWeight"; /* 入库重量*/
public static final String FIELD_REMAINING_QTY = "remainingQty"; /* 剩余数量*/
public static final String FIELD_REMAINING_UNIT_WEIGHT = "remainingUnitWeight"; /* 剩余单量*/
public static final String FIELD_REMAINING_WEIGHT = "remainingWeight"; /* 剩余重量*/
public static final String COL_ID = "ID"; /* ID*/
......@@ -97,13 +101,17 @@ public class HGSC010A extends DaoEPBase {
private String inventType = " "; /* 存货类型*/
private String productCode = " "; /* 成品编码*/
private String productName = " "; /* 成品名称*/
private Long specId = new Long(0); /* 规格ID*/
private String spec = " "; /* 规格*/
private String unit = " "; /* 单位*/
private BigDecimal pcsQty = new BigDecimal("0"); /* 加工数量*/
private BigDecimal pcsUnitWeight = new BigDecimal("0"); /* 加工单量*/
private BigDecimal pcsWeight = new BigDecimal("0"); /* 加工重量*/
private BigDecimal depositQty = new BigDecimal("0"); /* 入库数量*/
private BigDecimal depositUnitWeight = new BigDecimal("0"); /* 入库单重*/
private BigDecimal depositWeight = new BigDecimal("0"); /* 入库重量*/
private BigDecimal remainingQty = new BigDecimal("0"); /* 剩余数量*/
private BigDecimal remainingUnitWeight = new BigDecimal("0"); /* 剩余单量*/
private BigDecimal remainingWeight = new BigDecimal("0"); /* 剩余重量*/
/**
......@@ -181,6 +189,10 @@ public class HGSC010A extends DaoEPBase {
eiColumn.setDescName("成品名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC_ID);
eiColumn.setDescName("规格ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC);
eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn);
......@@ -196,6 +208,13 @@ public class HGSC010A extends DaoEPBase {
eiColumn.setDescName("加工数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PCS_UNIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(17);
eiColumn.setDescName("加工单量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PCS_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
......@@ -210,6 +229,13 @@ public class HGSC010A extends DaoEPBase {
eiColumn.setDescName("入库数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEPOSIT_UNIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(17);
eiColumn.setDescName("入库单量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEPOSIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
......@@ -224,6 +250,13 @@ public class HGSC010A extends DaoEPBase {
eiColumn.setDescName("剩余数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMAINING_UNIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(17);
eiColumn.setDescName("剩余单量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMAINING_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
......@@ -641,6 +674,39 @@ public class HGSC010A extends DaoEPBase {
public void setRemainingWeight(BigDecimal remainingWeight) {
this.remainingWeight = remainingWeight;
}
public Long getSpecId() {
return specId;
}
public void setSpecId(Long specId) {
this.specId = specId;
}
public BigDecimal getPcsUnitWeight() {
return pcsUnitWeight;
}
public void setPcsUnitWeight(BigDecimal pcsUnitWeight) {
this.pcsUnitWeight = pcsUnitWeight;
}
public BigDecimal getDepositUnitWeight() {
return depositUnitWeight;
}
public void setDepositUnitWeight(BigDecimal depositUnitWeight) {
this.depositUnitWeight = depositUnitWeight;
}
public BigDecimal getRemainingUnitWeight() {
return remainingUnitWeight;
}
public void setRemainingUnitWeight(BigDecimal remainingUnitWeight) {
this.remainingUnitWeight = remainingUnitWeight;
}
/**
* get the value from Map.
*
......@@ -666,13 +732,17 @@ public class HGSC010A extends DaoEPBase {
setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
setProductCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_CODE)), productCode));
setProductName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_NAME)), productName));
setSpecId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_SPEC_ID)), specId));
setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SPEC)), spec));
setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UNIT)), unit));
setPcsQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PCS_QTY)), pcsQty));
setPcsUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PCS_UNIT_WEIGHT)), pcsUnitWeight));
setPcsWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PCS_WEIGHT)), pcsWeight));
setDepositQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_QTY)), depositQty));
setDepositUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_UNIT_WEIGHT)), depositUnitWeight));
setDepositWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_WEIGHT)), depositWeight));
setRemainingQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_QTY)), remainingQty));
setRemainingUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_UNIT_WEIGHT)), remainingUnitWeight));
setRemainingWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_WEIGHT)), remainingWeight));
}
......@@ -700,13 +770,17 @@ public class HGSC010A extends DaoEPBase {
map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
map.put(FIELD_PRODUCT_CODE, StringUtils.toString(productCode, eiMetadata.getMeta(FIELD_PRODUCT_CODE)));
map.put(FIELD_PRODUCT_NAME, StringUtils.toString(productName, eiMetadata.getMeta(FIELD_PRODUCT_NAME)));
map.put(FIELD_SPEC_ID, StringUtils.toString(specId, eiMetadata.getMeta(FIELD_SPEC_ID)));
map.put(FIELD_SPEC, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_SPEC)));
map.put(FIELD_UNIT, StringUtils.toString(unit, eiMetadata.getMeta(FIELD_UNIT)));
map.put(FIELD_PCS_QTY, StringUtils.toString(pcsQty, eiMetadata.getMeta(FIELD_PCS_QTY)));
map.put(FIELD_PCS_UNIT_WEIGHT, StringUtils.toString(pcsUnitWeight, eiMetadata.getMeta(FIELD_PCS_UNIT_WEIGHT)));
map.put(FIELD_PCS_WEIGHT, StringUtils.toString(pcsWeight, eiMetadata.getMeta(FIELD_PCS_WEIGHT)));
map.put(FIELD_DEPOSIT_QTY, StringUtils.toString(depositQty, eiMetadata.getMeta(FIELD_DEPOSIT_QTY)));
map.put(FIELD_DEPOSIT_UNIT_WEIGHT, StringUtils.toString(depositUnitWeight, eiMetadata.getMeta(FIELD_DEPOSIT_UNIT_WEIGHT)));
map.put(FIELD_DEPOSIT_WEIGHT, StringUtils.toString(depositWeight, eiMetadata.getMeta(FIELD_DEPOSIT_WEIGHT)));
map.put(FIELD_REMAINING_QTY, StringUtils.toString(remainingQty, eiMetadata.getMeta(FIELD_REMAINING_QTY)));
map.put(FIELD_REMAINING_UNIT_WEIGHT, StringUtils.toString(remainingUnitWeight, eiMetadata.getMeta(FIELD_REMAINING_UNIT_WEIGHT)));
map.put(FIELD_REMAINING_WEIGHT, StringUtils.toString(remainingWeight, eiMetadata.getMeta(FIELD_REMAINING_WEIGHT)));
return map;
......
src/main/java/com/baosight/hggp/hg/sc/domain/HGSC010B.java
......@@ -39,13 +39,17 @@ public class HGSC010B extends DaoEPBase {
public static final String FIELD_INVENT_TYPE = "inventType"; /* 存货类型*/
public static final String FIELD_INVENT_CODE = "inventCode"; /* 原料编码*/
public static final String FIELD_INVENT_NAME = "inventName"; /* 原料名称*/
public static final String FIELD_SPEC_ID = "specId"; /* 规格Id*/
public static final String FIELD_SPEC = "spec"; /* 规格*/
public static final String FIELD_UNIT = "unit"; /* 单位*/
public static final String FIELD_PCS_QTY = "pcsQty"; /* 加工数量*/
public static final String FIELD_PCS_UNIT_WEIGHT = "pcsUnitWeight"; /* 加工单量*/
public static final String FIELD_PCS_WEIGHT = "pcsWeight"; /* 加工重量*/
public static final String FIELD_OUT_QTY = "outQty"; /* 出库数量*/
public static final String FIELD_OUT_UNIT_WEIGHT = "outUnitWeight"; /* 出库单量*/
public static final String FIELD_OUT_WEIGHT = "outWeight"; /* 出库重量*/
public static final String FIELD_REMAINING_QTY = "remainingQty"; /* 剩余数量*/
public static final String FIELD_REMAINING_UNIT_WEIGHT = "remainingUnitWeight"; /* 剩余单量*/
public static final String FIELD_REMAINING_WEIGHT = "remainingWeight"; /* 剩余重量*/
public static final String COL_ID = "ID"; /* ID*/
......@@ -97,13 +101,17 @@ public class HGSC010B extends DaoEPBase {
private String inventType = " "; /* 存货类型*/
private String inventCode = " "; /* 原料编码*/
private String inventName = " "; /* 原料名称*/
private Long specId = new Long(0);
private String spec = " "; /* 规格*/
private String unit = " "; /* 单位*/
private BigDecimal pcsQty = new BigDecimal("0"); /* 加工数量*/
private BigDecimal pcsUnitWeight = new BigDecimal("0");
private BigDecimal pcsWeight = new BigDecimal("0"); /* 加工重量*/
private BigDecimal outQty = new BigDecimal("0"); /* 出库数量*/
private BigDecimal outUnitWeight = new BigDecimal("0");
private BigDecimal outWeight = new BigDecimal("0"); /* 出库重量*/
private BigDecimal remainingQty = new BigDecimal("0"); /* 剩余数量*/
private BigDecimal remainingUnitWeight = new BigDecimal("0");
private BigDecimal remainingWeight = new BigDecimal("0"); /* 剩余重量*/
/**
......@@ -181,6 +189,10 @@ public class HGSC010B extends DaoEPBase {
eiColumn.setDescName("原料名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC_ID);
eiColumn.setDescName("规格ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC);
eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn);
......@@ -196,6 +208,13 @@ public class HGSC010B extends DaoEPBase {
eiColumn.setDescName("加工数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PCS_UNIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(17);
eiColumn.setDescName("加工单量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PCS_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
......@@ -210,6 +229,13 @@ public class HGSC010B extends DaoEPBase {
eiColumn.setDescName("出库数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_OUT_UNIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(17);
eiColumn.setDescName("出库单量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_OUT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
......@@ -224,6 +250,13 @@ public class HGSC010B extends DaoEPBase {
eiColumn.setDescName("剩余数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMAINING_UNIT_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(17);
eiColumn.setDescName("剩余单量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMAINING_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
......@@ -641,6 +674,39 @@ public class HGSC010B extends DaoEPBase {
public void setRemainingWeight(BigDecimal remainingWeight) {
this.remainingWeight = remainingWeight;
}
public Long getSpecId() {
return specId;
}
public void setSpecId(Long specId) {
this.specId = specId;
}
public BigDecimal getPcsUnitWeight() {
return pcsUnitWeight;
}
public void setPcsUnitWeight(BigDecimal pcsUnitWeight) {
this.pcsUnitWeight = pcsUnitWeight;
}
public BigDecimal getOutUnitWeight() {
return outUnitWeight;
}
public void setOutUnitWeight(BigDecimal outUnitWeight) {
this.outUnitWeight = outUnitWeight;
}
public BigDecimal getRemainingUnitWeight() {
return remainingUnitWeight;
}
public void setRemainingUnitWeight(BigDecimal remainingUnitWeight) {
this.remainingUnitWeight = remainingUnitWeight;
}
/**
* get the value from Map.
*
......@@ -666,13 +732,17 @@ public class HGSC010B extends DaoEPBase {
setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_NAME)), inventName));
setSpecId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_SPEC_ID)), specId));
setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SPEC)), spec));
setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UNIT)), unit));
setPcsQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PCS_QTY)), pcsQty));
setPcsUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PCS_UNIT_WEIGHT)), pcsUnitWeight));
setPcsWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PCS_WEIGHT)), pcsWeight));
setOutQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_OUT_QTY)), outQty));
setOutUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_OUT_UNIT_WEIGHT)), outUnitWeight));
setOutWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_OUT_WEIGHT)), outWeight));
setRemainingQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_QTY)), remainingQty));
setRemainingUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_UNIT_WEIGHT)), remainingUnitWeight));
setRemainingWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_WEIGHT)), remainingWeight));
}
......@@ -700,13 +770,17 @@ public class HGSC010B extends DaoEPBase {
map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
map.put(FIELD_INVENT_CODE, StringUtils.toString(inventCode, eiMetadata.getMeta(FIELD_INVENT_CODE)));
map.put(FIELD_INVENT_NAME, StringUtils.toString(inventName, eiMetadata.getMeta(FIELD_INVENT_NAME)));
map.put(FIELD_SPEC_ID, StringUtils.toString(specId, eiMetadata.getMeta(FIELD_SPEC_ID)));
map.put(FIELD_SPEC, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_SPEC)));
map.put(FIELD_UNIT, StringUtils.toString(unit, eiMetadata.getMeta(FIELD_UNIT)));
map.put(FIELD_PCS_QTY, StringUtils.toString(pcsQty, eiMetadata.getMeta(FIELD_PCS_QTY)));
map.put(FIELD_PCS_UNIT_WEIGHT, StringUtils.toString(pcsUnitWeight, eiMetadata.getMeta(FIELD_PCS_UNIT_WEIGHT)));
map.put(FIELD_PCS_WEIGHT, StringUtils.toString(pcsWeight, eiMetadata.getMeta(FIELD_PCS_WEIGHT)));
map.put(FIELD_OUT_QTY, StringUtils.toString(outQty, eiMetadata.getMeta(FIELD_OUT_QTY)));
map.put(FIELD_OUT_UNIT_WEIGHT, StringUtils.toString(outUnitWeight, eiMetadata.getMeta(FIELD_OUT_UNIT_WEIGHT)));
map.put(FIELD_OUT_WEIGHT, StringUtils.toString(outWeight, eiMetadata.getMeta(FIELD_OUT_WEIGHT)));
map.put(FIELD_REMAINING_QTY, StringUtils.toString(remainingQty, eiMetadata.getMeta(FIELD_REMAINING_QTY)));
map.put(FIELD_REMAINING_UNIT_WEIGHT, StringUtils.toString(remainingUnitWeight, eiMetadata.getMeta(FIELD_REMAINING_UNIT_WEIGHT)));
map.put(FIELD_REMAINING_WEIGHT, StringUtils.toString(remainingWeight, eiMetadata.getMeta(FIELD_REMAINING_WEIGHT)));
return map;
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC010A.xml
......@@ -84,6 +84,9 @@
<isNotEmpty prepend=" AND " property="productName">
PRODUCT_NAME = #productName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="specId">
SPEC_ID = #specId#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="spec">
SPEC = #spec#
</isNotEmpty>
......@@ -139,13 +142,17 @@
INVENT_TYPE as "inventType", <!-- 存货类型 -->
PRODUCT_CODE as "productCode", <!-- 成品编码 -->
PRODUCT_NAME as "productName", <!-- 成品名称 -->
SPEC_ID as "specId",
SPEC as "spec", <!-- 规格 -->
UNIT as "unit", <!-- 单位 -->
PCS_QTY as "pcsQty", <!-- 加工数量 -->
PCS_UNIT_WEIGHT as "pcsUnitWeight",
PCS_WEIGHT as "pcsWeight", <!-- 加工重量 -->
DEPOSIT_QTY as "depositQty", <!-- 入库数量 -->
DEPOSIT_UNIT_WEIGHT as "depositUnitWeight", <!-- 入库单量 -->
DEPOSIT_WEIGHT as "depositWeight", <!-- 入库重量 -->
REMAINING_QTY as "remainingQty", <!-- 剩余数量 -->
REMAINING_UNIT_WEIGHT as "remainingUnitWeight", <!-- 剩余单量 -->
REMAINING_WEIGHT as "remainingWeight" <!-- 剩余重量 -->
FROM ${hggpSchema}.HGSC010A WHERE 1=1
<include refid="condition" />
......@@ -258,19 +265,23 @@
INVENT_TYPE, <!-- 存货类型 -->
PRODUCT_CODE, <!-- 成品编码 -->
PRODUCT_NAME, <!-- 成品名称 -->
SPEC_ID,
SPEC, <!-- 规格 -->
UNIT, <!-- 单位 -->
PCS_QTY, <!-- 加工数量 -->
PCS_UNIT_WEIGHT,
PCS_WEIGHT, <!-- 加工重量 -->
DEPOSIT_QTY, <!-- 入库数量 -->
DEPOSIT_UNIT_WEIGHT,
DEPOSIT_WEIGHT, <!-- 入库重量 -->
REMAINING_QTY, <!-- 剩余数量 -->
REMAINING_UNIT_WEIGHT,
REMAINING_WEIGHT <!-- 剩余重量 -->
)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
#companyCode#, #companyName#, #parentId#, #contractCode#, #inventType#,
#productCode#, #productName#, #spec#, #unit#, #pcsQty#, #pcsWeight#, #depositQty#, #depositWeight#,
#remainingQty#, #remainingWeight#)
#productCode#, #productName#, #specId#, #spec#, #unit#, #pcsQty#, #pcsUnitWeight#, #pcsWeight#, #depositQty#, #depositUnitWeight#, #depositWeight#,
#remainingQty#, #remainingUnitWeight#, #remainingWeight#)
</insert>
<delete id="delete">
......@@ -295,13 +306,17 @@
INVENT_TYPE = #inventType#, <!-- 存货类型 -->
PRODUCT_CODE = #productCode#, <!-- 成品编码 -->
PRODUCT_NAME = #productName#, <!-- 成品名称 -->
SPEC_ID = #specId#,
SPEC = #spec#, <!-- 规格 -->
UNIT = #unit#, <!-- 单位 -->
PCS_QTY = #pcsQty#, <!-- 加工数量 -->
PCS_UNIT_WEIGHT = #pcsUnitWeight#,
PCS_WEIGHT = #pcsWeight#, <!-- 加工重量 -->
DEPOSIT_QTY = #depositQty#, <!-- 入库数量 -->
DEPOSIT_UNIT_WEIGHT = #depositUnitWeight#,
DEPOSIT_WEIGHT = #depositWeight#, <!-- 入库重量 -->
REMAINING_QTY = #remainingQty#, <!-- 剩余数量 -->
REMAINING_UNIT_WEIGHT = #remainingUnitWeight#,
REMAINING_WEIGHT = #remainingWeight# <!-- 剩余重量 -->
WHERE
ID = #id#
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC010B.xml
......@@ -84,6 +84,9 @@
<isNotEmpty prepend=" AND " property="inventName">
INVENT_NAME = #inventName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="specId">
SPEC_ID = #specId#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="spec">
SPEC = #spec#
</isNotEmpty>
......@@ -111,6 +114,12 @@
<isNotEmpty prepend=" AND " property="parentIds">
PARENT_ID IN <iterate close=")" open="(" conjunction="," property="parentIds">#parentIds[]#</iterate>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="contractCodes">
CONTRACT_CODE IN <iterate close=")" open="(" conjunction="," property="contractCodes">#contractCodes[]#</iterate>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="isRemainingQty">
REMAINING_QTY > 0
</isNotEmpty>
</sql>
<select id="query" parameterClass="java.util.HashMap"
......@@ -133,13 +142,17 @@
INVENT_TYPE as "inventType", <!-- 存货类型 -->
INVENT_CODE as "inventCode", <!-- 原料编码 -->
INVENT_NAME as "inventName", <!-- 原料名称 -->
SPEC_ID as "specId",
SPEC as "spec", <!-- 规格 -->
UNIT as "unit", <!-- 单位 -->
PCS_QTY as "pcsQty", <!-- 加工数量 -->
PCS_UNIT_WEIGHT as "pcsUnitWeight",
PCS_WEIGHT as "pcsWeight", <!-- 加工重量 -->
OUT_QTY as "outQty", <!-- 出库数量 -->
OUT_UNIT_WEIGHT as "outUnitWeight",
OUT_WEIGHT as "outWeight", <!-- 出库重量 -->
REMAINING_QTY as "remainingQty", <!-- 剩余数量 -->
REMAINING_UNIT_WEIGHT as "remainingUnitWeight",
REMAINING_WEIGHT as "remainingWeight" <!-- 剩余重量 -->
FROM ${hggpSchema}.HGSC010B WHERE 1=1
<include refid="condition" />
......@@ -252,19 +265,24 @@
INVENT_TYPE, <!-- 存货类型 -->
INVENT_CODE, <!-- 原料编码 -->
INVENT_NAME, <!-- 原料名称 -->
SPEC_ID,
SPEC, <!-- 规格 -->
UNIT, <!-- 单位 -->
PCS_QTY, <!-- 加工数量 -->
PCS_UNIT_WEIGHT,
PCS_WEIGHT, <!-- 加工重量 -->
OUT_QTY, <!-- 出库数量 -->
OUT_UNIT_WEIGHT,
OUT_WEIGHT, <!-- 出库重量 -->
REMAINING_QTY, <!-- 剩余数量 -->
REMAINING_UNIT_WEIGHT,
REMAINING_WEIGHT <!-- 剩余重量 -->
)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
#companyCode#, #companyName#, #parentId#, #contractCode#, #inventType#,
#inventCode#, #inventName#, #spec#, #unit#, #pcsQty#, #pcsWeight#, #outQty#, #outWeight#, #remainingQty#,
#remainingWeight#)
#inventCode#, #inventName#, #specId#, #spec#, #unit#, #pcsQty#, #pcsUnitWeight#, #pcsWeight#, #outQty#,
#outUnitWeight#, #outWeight#, #remainingQty#,
#remainingUnitWeight#, #remainingWeight#)
</insert>
<delete id="delete">
......@@ -289,13 +307,17 @@
INVENT_TYPE = #inventType#, <!-- 存货类型 -->
INVENT_CODE = #inventCode#, <!-- 原料编码 -->
INVENT_NAME = #inventName#, <!-- 原料名称 -->
SPEC_ID = #specId#,
SPEC = #spec#, <!-- 规格 -->
UNIT = #unit#, <!-- 单位 -->
PCS_QTY = #pcsQty#, <!-- 加工数量 -->
PCS_UNIT_WEIGHT = #pcsUnitWeight#, <!-- 加工单量 -->
PCS_WEIGHT = #pcsWeight#, <!-- 加工重量 -->
OUT_QTY = #outQty#, <!-- 出库数量 -->
OUT_UNIT_WEIGHT = #outUnitWeight#,
OUT_WEIGHT = #outWeight#, <!-- 出库重量 -->
REMAINING_QTY = #remainingQty#, <!-- 剩余数量 -->
REMAINING_UNIT_WEIGHT = #remainingUnitWeight#,
REMAINING_WEIGHT = #remainingWeight# <!-- 剩余重量 -->
WHERE
ID = #id#
......
src/main/webapp/HG/KC/HGKC014.js
......@@ -136,11 +136,16 @@ function selectFunc() {
"&inqu_status-0-companyCode=" + rows[0].companyCode +
"&inqu_status-0-companyName=" + rows[0].companyName +
"&inqu_status-0-whCode=" + rows[0].whCode +
"&inqu_status-0-whName=" + rows[0].whName +
"&inqu_status-0-depositCode=" + rows[0].depositCode +
"&inqu_status-0-parentId=" + rows[0].id ,
title: "<div style='text-align: center;'>委外入库详情</div>",
width: "90%",
height: "80%",
callbackName: function (){
// 关闭弹窗
JSColorbox.close();
}
});
}
......
src/main/webapp/HG/KC/HGKC014B.js
......@@ -17,21 +17,29 @@ $(function () {
grid.dataSource.bind("change", function (e) {
if (e.field == "depositQty"){
let depositQty = e.items[0]['depositQty'];
let remainingUnitWeight = e.items[0]['remainingUnitWeight'];
let remainingQty = e.items[0]['remainingQty'];
if (depositQty > remainingQty){
message("选中行\"入库数量\"，不能大于\"剩余数量\"!");
return;
}
remainingQty = remainingQty - depositQty;
resultGrid.setCellValue(e.items[0],"depositUnitWeight",remainingUnitWeight);
resultGrid.setCellValue(e.items[0],"depositWeight",depositQty * remainingUnitWeight);
resultGrid.setCellValue(e.items[0],"remainingQty",remainingQty);
resultGrid.setCellValue(e.items[0],"remainingWeight",remainingQty * remainingUnitWeight);
}else if (e.field == "depositWeight"){
let depositWeight = e.items[0]['depositWeight'];
let remainingWeight = e.items[0]['remainingWeight'];
let remainingUnitWeight = e.items[0]['remainingUnitWeight'];
if (depositWeight > remainingWeight){
message("选中行\"入库重量\"，不能大于\"剩余重量\"!");
return;
}
remainingWeight = remainingWeight - depositWeight;
resultGrid.setCellValue(e.items[0],"depositUnitWeight",remainingUnitWeight);
resultGrid.setCellValue(e.items[0],"depositQty",depositWeight / remainingUnitWeight);
resultGrid.setCellValue(e.items[0],"remainingQty",remainingWeight / remainingUnitWeight);
resultGrid.setCellValue(e.items[0],"remainingWeight",remainingWeight);
}
});
......
src/main/webapp/HG/KC/HGKC014B.jsp
......@@ -23,6 +23,7 @@
<EF:EFInput blockId="inqu_status" row="0" ename="companyCode" cname="公司编码" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="companyName" cname="公司编码" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="whCode" cname="仓库编码" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="whName" cname="仓库名称" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="parentId" cname="上级ID" type="hidden"/>
<EF:EFInput blockId="inqu_status" row="0" ename="depositCode" cname="委外入库单号" type="hidden"/>
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row" isFloat="true" copyToAdd="false">
......@@ -44,6 +45,10 @@
displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数！"/>
<EF:EFColumn ename="depositUnitWeight" cname="入库单量" width="120" enable="true" format="{0:N3}" editType="text"
displayType="0.00" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false" hidden="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="depositWeight" cname="入库重量" width="100" enable="true" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
......@@ -52,6 +57,10 @@
displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数！"/>
<EF:EFColumn ename="remainingUnitWeight" cname="剩余单量" width="100" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="remainingWeight" cname="剩余重量" width="100" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
......
src/main/webapp/HG/SC/HGSC010.jsp
......@@ -6,7 +6,7 @@
To change this template use File | Settings | File Templates.
--%>
<!DOCTYPE html>
<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %><
<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
......
src/main/webapp/HG/SC/HGSC010A.js
......@@ -43,6 +43,7 @@ $(function () {
for (let i = 0; i < inventRecordBox.length; i++) {
if (inventRecordBox[i]['valueField'] === e.items[0]['productCode']) {
resultGrid.setCellValue(e.items[0],"productName",inventRecordBox[i]['textField']);
resultGrid.setCellValue(e.items[0],"specId",inventRecordBox[i]['param2Field']);
resultGrid.setCellValue(e.items[0],"spec",inventRecordBox[i]['param4Field']);
resultGrid.setCellValue(e.items[0],"unit",inventRecordBox[i]['param6Field']);
if (isBlank(e.items[0]['inventType'])){
......@@ -52,9 +53,19 @@ $(function () {
}
loadChange(grid, e, "pcsQty");
}else if (e.field == "pcsQty"){
resultGrid.setCellValue(e.items[0],"remainingQty",e.items[0]['pcsQty']);
let pcsQty = e.items[0]['pcsQty'];
let pcsWeight= e.items[0]['pcsWeight'];
let pcsUnitWeight= pcsWeight / pcsQty;
resultGrid.setCellValue(e.items[0],"remainingQty",pcsQty);
resultGrid.setCellValue(e.items[0],"remainingUnitWeight",pcsUnitWeight.toFixed(3));
resultGrid.setCellValue(e.items[0],"pcsUnitWeight",pcsUnitWeight.toFixed(3));
}else if (e.field == "pcsWeight"){
resultGrid.setCellValue(e.items[0],"remainingWeight",e.items[0]['pcsWeight']);
let pcsQty = e.items[0]['pcsQty'];
let pcsWeight= e.items[0]['pcsWeight'];
let pcsUnitWeight= pcsWeight / pcsQty;
resultGrid.setCellValue(e.items[0],"remainingWeight",pcsWeight);
resultGrid.setCellValue(e.items[0],"remainingUnitWeight",pcsUnitWeight.toFixed(3));
resultGrid.setCellValue(e.items[0],"pcsUnitWeight",pcsUnitWeight.toFixed(3));
}
});
},
......@@ -111,6 +122,7 @@ $(function () {
detailGrid.setCellValue(e.items[0],"inventName",inventRecordBox[i]['textField']);
detailGrid.setCellValue(e.items[0],"spec",inventRecordBox[i]['param4Field']);
detailGrid.setCellValue(e.items[0],"unit",inventRecordBox[i]['param6Field']);
detailGrid.setCellValue(e.items[0],"specId",inventRecordBox[i]['param2Field']);
if (isBlank(e.items[0]['inventType'])){
detailGrid.setCellValue(e.items[0],"inventType",inventRecordBox[i]['param3Field']);
}
......@@ -118,9 +130,19 @@ $(function () {
}
loadChange(grid, e, "pcsQty");
}else if (e.field == "pcsQty"){
detailGrid.setCellValue(e.items[0],"remainingQty",e.items[0]['pcsQty']);
let pcsQty = e.items[0]['pcsQty'];
let pcsWeight= e.items[0]['pcsWeight'];
let pcsUnitWeight= pcsWeight / pcsQty;
detailGrid.setCellValue(e.items[0],"remainingQty",pcsQty);
detailGrid.setCellValue(e.items[0],"remainingUnitWeight",pcsUnitWeight.toFixed(3));
detailGrid.setCellValue(e.items[0],"pcsUnitWeight",pcsUnitWeight.toFixed(3));
}else if (e.field == "pcsWeight"){
detailGrid.setCellValue(e.items[0],"remainingWeight",e.items[0]['pcsWeight']);
let pcsQty = e.items[0]['pcsQty'];
let pcsWeight= e.items[0]['pcsWeight'];
let pcsUnitWeight= pcsWeight / pcsQty;
detailGrid.setCellValue(e.items[0],"remainingWeight",pcsWeight);
detailGrid.setCellValue(e.items[0],"remainingUnitWeight",pcsUnitWeight.toFixed(3));
detailGrid.setCellValue(e.items[0],"pcsUnitWeight",pcsUnitWeight.toFixed(3));
}
});
},
......
src/main/webapp/HG/SC/HGSC010A.jsp
......@@ -35,12 +35,17 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
filter="contains">
</EF:EFComboColumn>
<EF:EFColumn ename="specId" cname="规格ID" width="140" align="center" maxLength="50" hidden="true"/>
<EF:EFColumn ename="spec" cname="规格" width="140" align="center" maxLength="50"/>
<EF:EFColumn ename="unit" cname="单位" width="80" align="center"/>
<EF:EFColumn ename="pcsQty" cname="加工数量" width="120" enable="true" format="{0:N0}" editType="text"
displayType="0" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数！"/>
<EF:EFColumn ename="pcsUnitWeight" cname="加工单量" width="120" enable="true" format="{0:N3}" editType="text"
displayType="0.00" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false" hidden="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="pcsWeight" cname="加工重量" width="120" enable="true" format="{0:N3}" editType="text"
displayType="0.00" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
......@@ -49,6 +54,10 @@
displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数！"/>
<EF:EFColumn ename="depositUnitWeight" cname="入库单量" width="120" enable="true" format="{0:N3}" editType="text"
displayType="0.00" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false" hidden="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="depositWeight" cname="入库重量" width="100" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
......@@ -57,6 +66,10 @@
displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数！"/>
<EF:EFColumn ename="remainingUnitWeight" cname="剩余单量" width="100" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false" hidden="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="remainingWeight" cname="剩余重量" width="100" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
......@@ -77,12 +90,17 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
filter="contains">
</EF:EFComboColumn>
<EF:EFColumn ename="specId" cname="规格ID" width="140" align="center" maxLength="50" hidden="true"/>
<EF:EFColumn ename="spec" cname="规格" width="140" align="center" maxLength="50"/>
<EF:EFColumn ename="unit" cname="单位" width="80" align="center"/>
<EF:EFColumn ename="pcsQty" cname="加工数量" width="120" enable="true" format="{0:N0}" editType="text"
displayType="0" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数！"/>
<EF:EFColumn ename="pcsUnitWeight" cname="加工单量" width="120" enable="true" format="{0:N3}" editType="text"
displayType="0.00" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false" hidden="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="pcsWeight" cname="加工重量" width="120" enable="true" format="{0:N3}" editType="text"
displayType="0.00" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
......@@ -91,6 +109,10 @@
displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数！"/>
<EF:EFColumn ename="outUnitWeight" cname="出库单量" width="120" enable="true" format="{0:N3}" editType="text"
displayType="0.00" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false" hidden="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="outWeight" cname="出库重量" width="100" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
......@@ -99,6 +121,10 @@
displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数！"/>
<EF:EFColumn ename="remainingUnitWeight" cname="剩余单量" width="100" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false" hidden="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="remainingWeight" cname="剩余重量" width="100" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
......
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