Skip to content

H
hg-smart
Commit 68124012 by liuyang
Options

2024-07-22 1.供应商分类字段不需要删除 

           2.供应商类型为原材料供应商、辅料供应商、劳务供应商、其他供应商
           3.增加税号字段
parent c277c5ba
Showing with 54 additions and 18 deletions
src/main/java/com/baosight/hggp/hg/pz/domain/HGPZ003.java
......@@ -46,6 +46,7 @@ public class HGPZ003 extends DaoEPBase {
public static final String FIELD_UPDATED_NAME = "updatedName"; /* 更新人名称*/
public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 更新时间*/
public static final String FIELD_DELETE_FLAG = "deleteFlag"; /* 是否删除0:否1.是*/
public static final String FIELD_TAX_CODE = "taxCode";
public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 帐套编码*/
......@@ -102,6 +103,7 @@ public class HGPZ003 extends DaoEPBase {
private String updatedName = " "; /* 更新人名称*/
private String updatedTime = " "; /* 更新时间*/
private Integer deleteFlag = 0; /* 是否删除0:否1.是*/
private String taxCode = " ";
/**
* initialize the metadata.
......@@ -209,7 +211,9 @@ public class HGPZ003 extends DaoEPBase {
eiColumn.setDescName("是否删除0:否1.是");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_TAX_CODE);
eiColumn.setDescName("税号");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -603,6 +607,15 @@ public class HGPZ003 extends DaoEPBase {
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public String getTaxCode() {
return taxCode;
}
public void setTaxCode(String taxCode) {
this.taxCode = taxCode;
}
/**
* get the value from Map.
*
......@@ -635,6 +648,7 @@ public class HGPZ003 extends DaoEPBase {
setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
setTaxCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_TAX_CODE)), taxCode));
}
/**
......@@ -668,6 +682,7 @@ public class HGPZ003 extends DaoEPBase {
map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
map.put(FIELD_TAX_CODE, StringUtils.toString(taxCode, eiMetadata.getMeta(FIELD_TAX_CODE)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ003.java
......@@ -81,6 +81,9 @@ public class ServiceHGPZ003 extends ServiceBase {
for (int i = 0; i < resultRows.size(); i++) {
HGPZ003 hgpz003 = new HGPZ003();
hgpz003.fromMap(resultRows.get(i));
if (hgpz003.getSupClass() == null) {
hgpz003.setSupClass(0);
}
if (hgpz003.getId() == null || hgpz003.getId() == 0) {
this.add(hgpz003);
} else {
......
src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ003.xml
......@@ -104,6 +104,9 @@
<isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="taxCode">
TAX_CODE = #taxCode#
</isNotEmpty>
</sql>
<!--<sql id="authCondition">
......@@ -152,7 +155,8 @@
UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_NAME as "updatedName", <!-- 更新人名称 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
DELETE_FLAG as "deleteFlag" <!-- 是否删除0:否1.是 -->
DELETE_FLAG as "deleteFlag", <!-- 是否删除0:否1.是 -->
TAX_CODE as "taxCode"
FROM ${hggpSchema}.HGPZ003 WHERE 1=1 AND DELETE_FLAG = 0
<include refid="condition" />
<dynamic prepend="ORDER BY">
......@@ -270,9 +274,10 @@
UPDATED_BY, <!-- 更新人 -->
UPDATED_NAME, <!-- 更新人名称 -->
UPDATED_TIME, <!-- 更新时间 -->
DELETE_FLAG <!-- 是否删除0:否1.是 -->
DELETE_FLAG, <!-- 是否删除0:否1.是 -->
TAX_CODE
)
VALUES (#id#, #accountCode#, #depCode#, #supType#, #supClass#, #supCode#, #supName#, #headName#, #phoneName#, #address#, #openBankCode#, #openBankName#, #accountNum#, #assLevel#, #score#, #filePath#, #status#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#)
VALUES (#id#, #accountCode#, #depCode#, #supType#, #supClass#, #supCode#, #supName#, #headName#, #phoneName#, #address#, #openBankCode#, #openBankName#, #accountNum#, #assLevel#, #score#, #filePath#, #status#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#,#taxCode#)
</insert>
<delete id="delete">
......@@ -294,7 +299,8 @@
ACCOUNT_NUM = #accountNum#, <!-- 银行账号 -->
ASS_LEVEL = #assLevel#, <!-- 评定等级 -->
SCORE = #score#, <!-- 综合得分 -->
STATUS = #status# <!-- 状态 0禁用 1启用 -->
STATUS = #status#, <!-- 状态 0禁用 1启用 -->
TAX_CODE = #taxCode#
WHERE
ID = #id#
</update>
......
src/main/webapp/HG/PZ/HGPZ003.js
......@@ -22,7 +22,8 @@ $(function() {
//delete: false, // 显示删除按钮
cancel:false,
},
columns: [{
columns: [
{
field: "operator",
template: function (item) {
let filePath = item.filePath;
......@@ -96,7 +97,7 @@ let cancel = function(){
$("#inqu_data-1-supCode").val('');
IPLAT.EFSelect.value($("#inqu_data-1-supType"), '');
$("#inqu_data-1-supName").val('');
IPLAT.EFSelect.value($("#inqu_data-1-supClass"), '');
//IPLAT.EFSelect.value($("#inqu_data-1-supClass"), '');
$("#inqu_data-1-headName").val('');
$("#inqu_data-1-phoneName").val('');
$("#inqu_data-1-address").val('');
......@@ -104,6 +105,7 @@ let cancel = function(){
$("#inqu_data-1-openBankCode").val('');
$("#inqu_data-1-assLevel").val('');
$("#inqu_data-1-score").val('');
$("#inqu_data-1-taxCode").val('');
IPLAT.EFSelect.value($("#inqu_data-1-status"), '');
// 关闭弹窗
$("#updateGroup").data("kendoWindow").close();
......@@ -116,7 +118,7 @@ let submit = function () {
let supCode = $("#inqu_data-1-supCode").val();
let supType = $("#inqu_data-1-supType").val();
let supName = $("#inqu_data-1-supName").val();
let supClass = $("#inqu_data-1-supClass").val();
//let supClass = $("#inqu_data-1-supClass").val();
let headName = $("#inqu_data-1-headName").val();
let phoneName = $("#inqu_data-1-phoneName").val();
let address = $("#inqu_data-1-address").val();
......@@ -125,14 +127,15 @@ let submit = function () {
let assLevel = $("#inqu_data-1-assLevel").val();
let score = $("#inqu_data-1-score").val();
let status = $("#inqu_data-1-status").val();
let taxCode = $("#inqu_data-1-taxCode").val();
if(isBlank(supType)){
message("\"供应商类型\"，不能为空!");
return false;
}
if(isBlank(supClass)){
/*if(isBlank(supClass)){
message("\"供应商类别\"，不能为空!");
return false;
}
}*/
if(isBlank(supName)){
message("\"供应商名称\"，不能为空!");
return false;
......@@ -150,7 +153,7 @@ let submit = function () {
ei.set("result-0-supCode", supCode);
ei.set("result-0-supType", supType);
ei.set("result-0-supName", supName);
ei.set("result-0-supClass", supClass);
//ei.set("result-0-supClass", supClass);
ei.set("result-0-headName", headName);
ei.set("result-0-phoneName", phoneName);
ei.set("result-0-address", address);
......@@ -159,6 +162,7 @@ let submit = function () {
ei.set("result-0-assLevel", assLevel);
ei.set("result-0-score", score);
ei.set("result-0-status", status);
ei.set("result-0-taxCode", taxCode);
// 调用请求 onSuccess 成功回掉函数
EiCommunicator.send("HGPZ003", "save", ei, {
onSuccess: function (ei) {
......@@ -183,7 +187,7 @@ function add(id) {
$("#inqu_data-1-supCode").val('');
IPLAT.EFSelect.value($("#inqu_data-1-supType"), '');
$("#inqu_data-1-supName").val('');
IPLAT.EFSelect.value($("#inqu_data-1-supClass"), '');
//IPLAT.EFSelect.value($("#inqu_data-1-supClass"), '');
$("#inqu_data-1-headName").val('');
$("#inqu_data-1-phoneName").val('');
$("#inqu_data-1-address").val('');
......@@ -191,6 +195,7 @@ function add(id) {
$("#inqu_data-1-openBankCode").val('');
$("#inqu_data-1-assLevel").val('');
$("#inqu_data-1-score").val('');
$("#inqu_data-1-taxCode").val('');
IPLAT.EFSelect.value($("#inqu_data-1-status"), '');
id.data("kendoWindow").open().center();
}
......@@ -211,7 +216,7 @@ function update(id) {
$("#inqu_data-1-supCode").val(rows[0]["supCode"]);
IPLAT.EFSelect.value($("#inqu_data-1-supType"), rows[0]["supType"]);
$("#inqu_data-1-supName").val(rows[0]["supName"]);
IPLAT.EFSelect.value($("#inqu_data-1-supClass"), rows[0]["supClass"]);
//IPLAT.EFSelect.value($("#inqu_data-1-supClass"), rows[0]["supClass"]);
$("#inqu_data-1-headName").val(rows[0]["headName"]);
$("#inqu_data-1-phoneName").val(rows[0]["phoneName"]);
$("#inqu_data-1-address").val(rows[0]["address"]);
......@@ -219,6 +224,7 @@ function update(id) {
$("#inqu_data-1-openBankCode").val(rows[0]["openBankCode"]);
$("#inqu_data-1-assLevel").val(rows[0]["assLevel"]);
$("#inqu_data-1-score").val(rows[0]["score"]);
$("#inqu_data-1-taxCode").val(rows[0]["taxCode"]);
IPLAT.EFSelect.value($("#inqu_data-1-status"), rows[0]["status"]);
//$("#inqu_status-1-supCode").removeAttr("type");
$("#updateGroup_wnd_title").text("修改企业管理");
......
src/main/webapp/HG/PZ/HGPZ003.jsp
......@@ -27,9 +27,9 @@
<EF:EFComboColumn cname="供应商类型" ename="supType" width="90" align="center" required="true" enable="false">
<EF:EFCodeOption codeName="hggp.hgpz.supType"/>
</EF:EFComboColumn>
<EF:EFComboColumn cname="供应商分类" ename="supClass" width="90" align="center" required="true" enable="false">
<%--<EF:EFComboColumn cname="供应商分类" ename="supClass" width="90" align="center" required="true" enable="false">
<EF:EFCodeOption codeName="hggp.hgpz.supClass"/>
</EF:EFComboColumn>
</EF:EFComboColumn>--%>
<EF:EFColumn cname="供应商名称" ename="supName" align="center" width="120" readonly="true" enable="false"/>
<EF:EFColumn cname="联系人" ename="headName" align="center" width="120" readonly="true"
enable="false"/>
......@@ -43,6 +43,8 @@
enable="false"/>
<EF:EFColumn cname="银行行号" ename="openBankCode" align="center" width="120" readonly="true"
enable="false"/>
<EF:EFColumn cname="税号" ename="taxCode" align="center" width="120" readonly="true"
enable="false"/>
<EF:EFColumn cname="评定等级" ename="assLevel" align="center" width="80" readonly="true"
enable="false"/>
<EF:EFColumn cname="综合得分" ename="score" align="center" width="80" readonly="true"
......@@ -71,7 +73,7 @@
<EF:EFInput blockId="inqu_data" row="1" ename="id" colWidth="6" cname="主键" type="hidden"/>
</div>
<div class="row">
<EF:EFSelect blockId="inqu_data" row="1" ename="supType" cname="供应商类型" colWidth="6" filter="contains">
<EF:EFSelect blockId="inqu_data" row="1" ename="supType" cname="供应商类型" colWidth="6" filter="contains" >
<EF:EFOption label="请选择" value=""/>
<EF:EFCodeOption codeName="hggp.hgpz.supType"/>
</EF:EFSelect>
......@@ -81,10 +83,10 @@
<EF:EFInput blockId="inqu_data" row="1" ename="supName" colWidth="6" cname="供应商名称"/>
</div>
<div class="row">
<EF:EFSelect blockId="inqu_data" row="1" ename="supClass" cname="供应商分类" colWidth="6" filter="contains">
<%--<EF:EFSelect blockId="inqu_data" row="1" ename="supClass" cname="供应商分类" colWidth="6" filter="contains">
<EF:EFOption label="请选择" value=""/>
<EF:EFCodeOption codeName="hggp.hgpz.supClass"/>
</EF:EFSelect>
</EF:EFSelect>--%>
</div>
<div class="row">
<EF:EFInput blockId="inqu_data" row="1" ename="headName" colWidth="6" cname="联系人"/>
......@@ -111,6 +113,10 @@
</div>
<div class="row">
<EF:EFInput blockId="inqu_data" row="1" ename="taxCode" colWidth="6" cname="税号"/>
</div>
<div class="row">
<EF:EFInput blockId="inqu_data" row="1" ename="assLevel" colWidth="6" cname="评定等级"/>
</div>
<div class="row">
......
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