Skip to content

H
hg-smart
Commit 35e0f15b by liuyang
Options

2024-08-30 发货单添加是否扣款和扣款方字段

parent 2d9e4dd8
Showing with 77 additions and 4 deletions
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX001.java
......@@ -53,6 +53,8 @@ public class HGYX001 extends DaoEPBase {
public static final String FIELD_CONS_QUANTITY = "consQuantity"; /* 发货数量*/
public static final String FIELD_CONS_WEIGHT = "consWeight"; /* 发货重量*/
public static final String FIELD_STATUS = "status"; /* 审批状态 0-未审核，1-已审核*/
public static final String FIELD_IS_CONTRACT = "isContract"; /*是否扣款*/
public static final String FIELD_CONTRACT_NAME = "contractName"; /*扣款方*/
public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
......@@ -124,6 +126,8 @@ public class HGYX001 extends DaoEPBase {
private BigDecimal consQuantity = new BigDecimal("0"); /* 发货数量*/
private BigDecimal consWeight = new BigDecimal("0"); /* 发货重量*/
private Integer status = 0; /* 审批状态 0-未审核，1-已审核*/
private Integer isContract = 0;
private String contractName = " ";
/**
* initialize the metadata.
......@@ -258,6 +262,13 @@ public class HGYX001 extends DaoEPBase {
eiColumn.setDescName("审批状态 0-未审核，1-已审核");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_IS_CONTRACT);
eiColumn.setDescName("是否扣款");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CONTRACT_NAME);
eiColumn.setDescName("扣款方");
eiMetadata.addMeta(eiColumn);
}
......@@ -748,6 +759,23 @@ public class HGYX001 extends DaoEPBase {
public void setStatus(Integer status) {
this.status = status;
}
public Integer getIsContract() {
return isContract;
}
public void setIsContract(Integer isContract) {
this.isContract = isContract;
}
public String getContractName() {
return contractName;
}
public void setContractName(String contractName) {
this.contractName = contractName;
}
/**
* get the value from Map.
*
......@@ -786,6 +814,8 @@ public class HGYX001 extends DaoEPBase {
setConsQuantity(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CONS_QUANTITY)), consQuantity));
setConsWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CONS_WEIGHT)), consWeight));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
setIsContract(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_IS_CONTRACT)), isContract));
setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NAME)), contractName));
}
/**
......@@ -825,6 +855,8 @@ public class HGYX001 extends DaoEPBase {
map.put(FIELD_CONS_QUANTITY, StringUtils.toString(consQuantity, eiMetadata.getMeta(FIELD_CONS_QUANTITY)));
map.put(FIELD_CONS_WEIGHT, StringUtils.toString(consWeight, eiMetadata.getMeta(FIELD_CONS_WEIGHT)));
map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
map.put(FIELD_IS_CONTRACT, StringUtils.toString(isContract, eiMetadata.getMeta(FIELD_IS_CONTRACT)));
map.put(FIELD_CONTRACT_NAME, StringUtils.toString(contractName, eiMetadata.getMeta(FIELD_CONTRACT_NAME)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX001A.java
......@@ -48,6 +48,7 @@ public class ServiceHGYX001A extends ServiceEPBase {
outInfo = super.query(inInfo, HGYX001A.QUERY, new HGYX001A());
outInfo.getBlock(EiConstant.queryBlock).setRows(Collections.singletonList(hgYx001));
outInfo.getBlock(EiConstant.queryBlock).setBlockMeta(new HGYX001().eiMetadata);
}
outInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "type", type);
List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
......
src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX001B.java
......@@ -43,6 +43,7 @@ public class ServiceHGYX001B extends ServiceEPBase {
outInfo = super.query(inInfo, HGYX001A.QUERY, new HGYX001A());
outInfo.getBlock(EiConstant.queryBlock).setRows(Collections.singletonList(hgYx001));
outInfo.getBlock(EiConstant.queryBlock).setBlockMeta(new HGYX001().eiMetadata);
}
//UserVO userVO = HGCWTools.HgCw002.getUserCompany();
List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
......
src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001.xml
......@@ -69,7 +69,9 @@
NUM_PLATE as "numPlate", <!-- 车号 -->
CONS_QUANTITY as "consQuantity", <!-- 发货数量 -->
CONS_WEIGHT as "consWeight", <!-- 发货重量 -->
STATUS as "status" <!-- 审批状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 审批状态 0-未审核，1-已审核 -->
IS_CONTRACT as "isContract", <!-- 是否完成 -->
CONTRACT_NAME as "contractName"
</sql>
<sql id="condition">
<include refid="HGXSDataAuth.authCondition"/>
......@@ -166,6 +168,9 @@
<isNotEmpty prepend=" AND " property="companyCodes">
COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="isContract">
IS_CONTRACT = #isContract#
</isNotEmpty>
</sql>
<select id="query" parameterClass="java.util.HashMap" resultClass="HGYX001">
......@@ -311,12 +316,14 @@
NUM_PLATE, <!-- 车号 -->
CONS_QUANTITY, <!-- 发货数量 -->
CONS_WEIGHT, <!-- 发货重量 -->
STATUS <!-- 审批状态 0-未审核，1-已审核 -->
STATUS, <!-- 审批状态 0-未审核，1-已审核 -->
IS_CONTRACT,
CONTRACT_NAME
)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
#updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #projCode#, #projName#, #deliveryCode#,
#outboundCode#, #consCode#, #consName#, #consWhCode#, #consWhName#, #consAddr#, #receCode#, #receName#,
#receAddr#, #receUserPhone#, #tranType#, #numPlate#, #consQuantity#, #consWeight#, #status#)
#receAddr#, #receUserPhone#, #tranType#, #numPlate#, #consQuantity#, #consWeight#, #status#, #isContract#, #contractName#)
<selectKey resultClass="long" keyProperty="id">
SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX001
</selectKey>
......@@ -364,7 +371,9 @@
NUM_PLATE = #numPlate#, <!-- 车号 -->
CONS_QUANTITY = #consQuantity#, <!-- 发货数量 -->
CONS_WEIGHT = #consWeight#, <!-- 发货重量 -->
STATUS = #status# <!-- 审批状态 0-未审核，1-已审核 -->
STATUS = #status#, <!-- 审批状态 0-未审核，1-已审核 -->
IS_CONTRACT = #isContract#,
CONTRACT_NAME = #contractName#
WHERE
ID = #id#
</update>
......
src/main/webapp/HG/YX/HGYX001.jsp
......@@ -38,6 +38,10 @@
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hggp.hgyx.status" condition="ITEM_CODE IN ('0','1')"/>
</EF:EFSelect>
<EF:EFSelect blockId="inqu_status" row="0" ename="isContract" cname="是否扣款" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hggp.common.yesNo"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
......@@ -76,6 +80,10 @@
<EF:EFColumn ename="consAddr" cname="发货地址" hidden="true" width="120" align="center"/>
<EF:EFColumn ename="consQuantity" cname="发货数量" enable="true" readonly="true" width="120" align="center" format="{0:N3}" data-rules="number"/>
<EF:EFColumn ename="consWeight" cname="发货重量" width="120" align="center" format="{0:N3}" data-rules="number"/>
<EF:EFComboColumn ename="isContract" cname="是否扣款" width="80" align="center" enable="false" defaultValue="0" required="true">
<EF:EFCodeOption codeName="hggp.common.yesNo"/>
</EF:EFComboColumn>
<EF:EFColumn ename="contractName" cname="扣款方" width="120" align="center"/>
<EF:EFComboColumn ename="status" cname="审核状态" width="80" align="center" enable="false" defaultValue="0" required="true">
<EF:EFCodeOption codeName="hggp.hgyx.status" condition="ITEM_CODE IN ('0','1')"/>
</EF:EFComboColumn>
......
src/main/webapp/HG/YX/HGYX001A.js
......@@ -221,6 +221,13 @@ $(function() {
});
return false;
}
let isContract = $("#inqu_status-0-isContract").val();
let contractName = $("#inqu_status-0-contractName").val();
if (isContract=="1" && isBlank(contractName)){
message("是扣款，扣款方不能为空");
flag = false;
return false;
}
let rows = resultGrid.getDataItems();
if (rows.length < 1) {
message("明细信息不能为空，请选择数据");
......@@ -259,6 +266,13 @@ $(function() {
});
return false;
}
let isContract = $("#inqu_status-0-isContract").val();
let contractName = $("#inqu_status-0-contractName").val();
if (isContract=="1" && isBlank(contractName)){
message("是扣款，扣款方不能为空");
flag = false;
return false;
}
let rows = resultGrid.getDataItems();
if (rows.length < 1) {
message("明细信息不能为空，请选择数据");
......
src/main/webapp/HG/YX/HGYX001A.jsp
......@@ -66,6 +66,10 @@
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
<EF:EFInput blockId="inqu_status" row="0" ename="type" cname="type" type="hidden" colWidth="3"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="isContract" cname="是否扣款" colWidth="3" filter="contains">
<EF:EFCodeOption codeName="hggp.common.yesNo"/>
</EF:EFSelect>
<EF:EFInput blockId="inqu_status" row="0" ename="contractName" cname="扣款方" required="false" colWidth="3"/>
</div>
</EF:EFRegion>
......
src/main/webapp/HG/YX/HGYX001B.jsp
......@@ -65,6 +65,10 @@
required="true" colWidth="3" disabled="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="isContract" cname="是否扣款" colWidth="3" filter="contains">
<EF:EFCodeOption codeName="hggp.common.yesNo"/>
</EF:EFSelect>
<EF:EFInput blockId="inqu_status" row="0" ename="contractName" cname="扣款方" required="true" colWidth="3"/>
</div>
</EF:EFRegion>
......
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