Skip to content

T
topsun-bpm
Commit e5bd92d0 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

财务客户bug修改

parent 0489fe8d
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 156 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerDetail.js
View file @ e5bd92d0
......@@ -75,7 +75,8 @@ function loadFinaCustomerPayListGrid() {
// 行号加一
sequence: (sapFinaCustomerPayGridManager.getData().length + 1)*10,
//( "0000000000000000" + num ).substr( -length )
zuawa: "000" + (sapFinaCustomerPayGridManager.getData().length + 1)
zuawa: "001",
zuawaName: "过账日期",
}
);
},
......@@ -132,10 +133,22 @@ function loadFinaCustomerPayListGrid() {
},
},
{
display: "根据分配号排序代码", name: "zuawa", width: 150, minWidth: 60, type: "String", align: "left",
// render:function (item){
// return item.sequence;
// }
display: "根据分配号排序代码", name: "zuawaName", width: 150, minWidth: 60, type: "String", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZUAWA"}
},
back: {
ZUAWA: "zuawa",
TTEXT: "zuawaName"
},
},
}
},
{
display: "付款条件", name: "ztermTextView", width: 100, minWidth: 60, type: "String", align: "left",
......@@ -316,6 +329,12 @@ function getExtendedData(processAction) {
//不验证
$('#submitForm').attr('check', false);
}
var stenr = $("#stenr").val();
var taxTypeName = $("#taxTypeName").val();
if (Public.isNotBlank(stenr) && Public.isBlank(taxTypeName)){
Public.tip("税号必须要有对应的税号类型");
return false;
}
const isAllData = $('#oldId') || !getId();
var extendedData = {};
var _grid = UICtrl.getGridManager('#sapFinaCustomerPayGrid');
......@@ -410,15 +429,32 @@ function bindEvent(){
$('#regionName').val(data.BEZEI);
}
});
// $('#lifnr').searchbox({
// type: "suppliers", name: "selectSuppliers",
// getParam: function (item) {
// },
// onChange: function (value, data) {
// $('#lifnr').val(data.partner);
// $('#name1').val(data.nameOrg1);
// }
// });
$('#taxTypeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "TTYPE",
}
},
onChange: function (value, data) {
$("#taxType").val(data.TAXTYPE);
$("#taxTypeName").val(data.TEXT);
}
});
$('input[name="stenr"]').mouseout(function () {
let val = $(this).val()
if (Public.isNotBlank(val)){
UICtrl.setElHideOrShow("#taxTypeName",false)
UICtrl.setElRequiredFlag("#taxTypeName",true)
}else {
UICtrl.setElHideOrShow("#taxTypeName",true)
UICtrl.setElRequiredFlag("#taxTypeName",false)
$("#taxTypeName").val("");
$("#taxType").val("");
}
})
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerDetail.jsp
View file @ e5bd92d0
......@@ -74,6 +74,8 @@
<div class="hg-form-row">
<x:inputC name="lifnr" label="供应商" labelCol="1" fieldCol="2" maxLength="30"/>
<x:inputC name="stenr" label="税号" labelCol="1" fieldCol="2" maxLength="30"/>
<x:hidden name="taxType"/>
<x:inputC name="taxTypeName" label="税号类型" labelCol="1" fieldCol="2" maxLength="30" wrapper="select"/>
<x:selectC name="sperr" label="中心记帐冻结" labelCol="1" fieldCol="2" dictionary="sperr"/>
</div>
<div class="hg-form-row">
......
topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerExtendDetail.js
View file @ e5bd92d0
......@@ -65,7 +65,9 @@ function loadFinaCustomerPayListGrid() {
UICtrl.addGridRow(sapFinaCustomerPayGridManager,
{
// 行号加一
sequence: (sapFinaCustomerPayGridManager.getData().length + 1)*10
sequence: (sapFinaCustomerPayGridManager.getData().length + 1)*10,
zuawa: "001",
zuawaName: "过账日期",
}
);
},
......@@ -122,8 +124,20 @@ function loadFinaCustomerPayListGrid() {
},
{
display: "根据分配号排序代码", name: "zuawa", width: 150, minWidth: 60, type: "String", align: "left",
render:function (item){
return item.sequence;
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZUAWA"}
},
back: {
ZUAWA: "zuawa",
TTEXT: "zuawaName"
},
},
}
},
{
......@@ -315,6 +329,12 @@ function getExtendedData(processAction) {
//不验证
$('#submitForm').attr('check', false);
}
var stenr = $("#stenr").val();
var taxTypeName = $("#taxTypeName").val();
if (Public.isNotBlank(stenr) && Public.isBlank(taxTypeName)){
Public.tip("税号必须要有对应的税号类型");
return false;
}
const isAllData = $('#oldId') || !getId();
var extendedData = {};
var pay_grid = UICtrl.getGridManager('#sapFinaCustomerPayGrid');
......@@ -373,6 +393,31 @@ function bindEvent(){
$('#regionName').val(data.BEZEI);
}
});
$('#taxTypeName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {
fieldName: "TTYPE",
}
},
onChange: function (value, data) {
$("#taxType").val(data.TAXTYPE);
$("#taxTypeName").val(data.TEXT);
}
});
$('input[name="stenr"]').mouseout(function () {
let val = $(this).val()
if (Public.isNotBlank(val)){
UICtrl.setElHideOrShow("#taxTypeName",false)
UICtrl.setElRequiredFlag("#taxTypeName",true)
}else {
UICtrl.setElHideOrShow("#taxTypeName",true)
UICtrl.setElRequiredFlag("#taxTypeName",false)
$("#taxTypeName").val("");
$("#taxType").val("");
}
})
}
function reloadGrid() {
......
topsun-xt/src/main/webapp/biz/topsun/sap/finaCustomer/finaCustomerExtendDetail.jsp
View file @ e5bd92d0
......@@ -15,54 +15,63 @@
<x:hidden name="id"/>
<x:hidden name="sId"/>
<x:hidden name="applyType"/>
<x:hidden name="billCode"/>
<x:hidden name="fillinDate" type="datetime"/>
<%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<x:hidden name="fullId"/>
<x:hidden name="organId"/>
<x:hidden name="organName"/>
<x:hidden name="deptId"/>
<x:hidden name="deptName"/>
<%-- <x:hidden name="deptName"/>--%>
<x:hidden name="positionId"/>
<x:hidden name="positionName"/>
<x:hidden name="personMemberId"/>
<x:hidden name="statusId"/>
<x:hidden name="personMemberName"/>
<%-- <x:hidden name="personMemberName"/>--%>
<x:title title="申请人填写区域" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="personMemberName" label="申请人" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="deptName" label="申请部门" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="fillinDate" label="申请日期" readonly="true" wrapper="dateTime" labelCol="1" fieldCol="2"/>
</div>
</div>
<x:title title="财务客户主基本数据" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="buPartner" label="业务伙伴编码" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="creationGroup" label="业务伙伴分组" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="partnerRole" label="业务伙伴角色" labelCol="1" fieldCol="2" required="false" readonly="true"/>
<x:selectC name="titleMedi" label="称谓代码" labelCol="1" fieldCol="2" dictionary="title" disabled="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="nameOrg1" label="财务客户名称1" labelCol="1" fieldCol="2" required="true" readonly="true"/>
<x:inputC name="buSort1Txt" label="搜索词1" labelCol="1" fieldCol="2" required="true" readonly="true"/>
<x:selectC name="langu" label="语言" labelCol="1" fieldCol="2" required="true" dictionary="langu" disabled="true"/>
<x:selectC name="sperr" label="中心记帐冻结" labelCol="1" fieldCol="2" dictionary="sperr" disabled="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="countryName" label="国家" labelCol="1" fieldCol="2" required="true" wrapper="select" disabled="true"/>
<x:hidden name="country"/>
<x:inputC name="regionName" label="地区" labelCol="1" fieldCol="2" required="false" wrapper="select" disabled="true"/>
<x:hidden name="region"/>
<x:inputC name="street" label="街道" labelCol="1" fieldCol="2" maxLength="35" readonly="true"/>
<x:inputC name="postCode1" label="城市邮政编码" labelCol="1" fieldCol="2" required="false" maxLength="6" readonly="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
<x:inputC name="telNumber" label="电话" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="mobNumber" label="移动电话" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="faxNumber" label="传真" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="lifnr" label="供应商" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
<x:inputC name="stenr" label="税号" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
</div>
<div class="hg-form-row">
<x:textareaC name="zbz01" label="备注" labelCol="1" fieldCol="11" rows="3" readonly="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="buPartner" label="业务伙伴编码" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="creationGroup" label="业务伙伴分组" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="partnerRole" label="业务伙伴角色" labelCol="1" fieldCol="2" required="false" readonly="true"/>
<x:selectC name="titleMedi" label="称谓代码" labelCol="1" fieldCol="2" dictionary="title" disabled="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="nameOrg1" label="财务客户名称1" labelCol="1" fieldCol="2" required="true" readonly="true"/>
<x:inputC name="buSort1Txt" label="搜索词1" labelCol="1" fieldCol="2" required="true" readonly="true"/>
<x:selectC name="langu" label="语言" labelCol="1" fieldCol="2" required="true" dictionary="langu" disabled="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="countryName" label="国家" labelCol="1" fieldCol="2" required="true" wrapper="select" disabled="true"/>
<x:hidden name="country"/>
<x:inputC name="regionName" label="地区" labelCol="1" fieldCol="2" required="false" wrapper="select" disabled="true"/>
<x:hidden name="region"/>
<x:inputC name="street" label="街道" labelCol="1" fieldCol="2" maxLength="35" readonly="true"/>
<x:inputC name="postCode1" label="城市邮政编码" labelCol="1" fieldCol="2" required="false" maxLength="6" readonly="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
<x:inputC name="telNumber" label="电话" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="mobNumber" label="移动电话" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="faxNumber" label="传真" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
</div>
<div class="hg-form-row">
<x:inputC name="lifnr" label="供应商" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
<x:inputC name="stenr" label="税号" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
<x:hidden name="taxType"/>
<x:inputC name="taxTypeName" label="税号类型" labelCol="1" fieldCol="2" maxLength="30" wrapper="select" readonly="true"/>
<x:selectC name="sperr" label="中心记帐冻结" labelCol="1" fieldCol="2" dictionary="sperr" disabled="true"/>
</div>
<div class="hg-form-row">
<x:textareaC name="zbz01" label="备注" labelCol="1" fieldCol="11" rows="3" readonly="true"/>
</div>
</div>
<div style="padding-top: 15px;">
......
topsun/src/main/java/com/huigou/topsun/sap/finaCustomer/application/impl/FinaCustomerApplicationImpl.java
View file @ e5bd92d0
......@@ -259,100 +259,6 @@ public class FinaCustomerApplicationImpl extends FlowBroker implements FinaCusto
/**
* 远程调用sap接口，传递数据
*/
// public void sendSapData(FinaCustomerInfo finaCustomer, List<FinaCustomerPay> payList, List<FinaCustomerBank> bankList) {
// FinaCustomerInfoVo finaCustomerVo = new FinaCustomerInfoVo();
// BeanUtil.copyProperties(finaCustomer, finaCustomerVo);
// finaCustomerVo.setKtokk(finaCustomerVo.getPartnerRole());
// finaCustomerVo.setUpdkz("I");
// if (finaCustomer.getApplyType().equals("1")) { //更新
// finaCustomerVo.setUpdkz("U");
// }
// if (finaCustomer.getApplyType().equals("-1")) { //删除
// finaCustomerVo.setUpdkz("D");
// }
// if (finaCustomer.getApplyType().equals("2")) { //扩展
// finaCustomerVo.setUpdkz("U");
// List<FinaCustomerPay> otherPayList = this.getOtherPayList(finaCustomer.getBuPartner());
// payList.addAll(otherPayList);
// List<FinaCustomerBank> otherBankList = this.getOtherBankList(finaCustomer.getBuPartner());
// bankList.addAll(otherBankList);
// }
// if ("0".equals(finaCustomerVo.getSperr())){
// finaCustomerVo.setSperr("");
// }
// if ("0".equals(finaCustomerVo.getSperm())){
// finaCustomerVo.setSperm("");
// }
// List<FinaCustomerPayVo> payVoList = new ArrayList<>();
// for (FinaCustomerPay finaCustomerPay : payList) {
// FinaCustomerPayVo payVo = new FinaCustomerPayVo();
// ClassHelper.copyProperties(finaCustomerPay, payVo);
// if ("0".equals(payVo.getSperrB())){
// payVo.setSperrB("");
// }
// payVoList.add(payVo);
// }
// finaCustomerVo.setFinaCustomerPayVoList(payVoList);
// List<FinaCustomerBankVo> bankVoList = new ArrayList<>();
// for (FinaCustomerBank finaCustomerBank : bankList) {
// FinaCustomerBankVo bankVo = new FinaCustomerBankVo();
// ClassHelper.copyProperties(finaCustomerBank, bankVo);
// //银行账户，BPM不处理，SAP处理
//// if (bankVo.getBankn().length() > 18){
//// String bankn = bankVo.getBankn();
//// bankVo.setBankn(bankn.substring(0,18));
//// //账户明细放18位后的值
//// bankVo.setBkref(bankn.substring(18,bankn.length()));
//// }
// //财务机构名称赋值组织名称1
// bankVo.setBanka(finaCustomerVo.getNameOrg1());
// bankVoList.add(bankVo);
// }
// finaCustomerVo.setFinaCustomerBankVoList(bankVoList);
// ObjectMapper objectMapper = new ObjectMapper();
// String url = "CUD_SUPPLY/SUPPLY_DATA";
// Map<String, Object> resultMap = new HashMap<>();
// resultMap.put("businessType", "财务客户主数据");
// resultMap.put("businessId", finaCustomer.getId());
// List<FinaCustomerInfoVo> finaCustomerVos = new ArrayList<>();
// finaCustomerVos.add(finaCustomerVo);
// try {
// String parameter=JSON.toJSONString(finaCustomerVo);
// parameter=parameter.replaceAll("finaCustomerPayList","LFB1");
// parameter=parameter.replaceAll("finaCustomerBankList","BANK");
// // parameter=com.huigou.topsun.util.CommonUtil.camelToUnderline(parameter);
// resultMap.put("parameter", parameter);
// String result = defaultHttpClient.execute(finaCustomerVos, url);
// List<SapResult> sapResultList = JSONObject.parseArray(result, SapResult.class);
// if (sapResultList.size()<1){
// throw new RuntimeException("数据传输失败，没有收到返回结果：" + sapResultList);
// }
// SapResult sapResult = sapResultList.get(0);
// resultMap.put("sequence", resultMap.get("row"));
// if ("S".equals(sapResult.getTYPE())) {
// if ("0".equals(finaCustomer.getApplyType())){
// finaCustomer.setBuPartner(sapResult.getMESSAGE_V1().substring(4));
// resultMap.put("MESSAGE", sapResult.getMESSAGE()+sapResult.getMESSAGE_V1().substring(4));
// } else {
// resultMap.put("MESSAGE", sapResult.getMESSAGE());
// }
// resultMap.put("TYPE", sapResult.getTYPE());
// finaCustomerRepository.save(finaCustomer);
//
// } else {
// throw new RuntimeException("数据传输失败，请稍后手动重试！" + sapResult.getMESSAGE());
// }
// } catch (Exception e) {
// resultMap.put("TYPE", "E");
// resultMap.put("MESSAGE", e.getMessage());
// throw new RuntimeException("数据传输失败请检查数据后重试！" + e.getMessage());
// } finally {
// sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);
// }
//
//
// }
@Transactional
public void sendSapClientData(FinaCustomerInfo finaCustomer, List<FinaCustomerPay> payList, List<FinaCustomerBank> bankList) {
List<MdClientSapVo> mdClientSapVoList = new ArrayList<>();
......@@ -367,7 +273,7 @@ public class FinaCustomerApplicationImpl extends FlowBroker implements FinaCusto
mdClientSapVo.setStras(finaCustomer.getStreet());//街道
mdClientSapVo.setTaxnumxl(finaCustomer.getStenr());//税号
mdClientSapVo.setUpdkz("I");
mdClientSapVo.setTaxtype("CN5");//税类别
//mdClientSapVo.setTaxType("CN5");//税类别
if (finaCustomer.getApplyType().equals("1")) { //更新
mdClientSapVo.setUpdkz("U");
}
......@@ -391,10 +297,6 @@ public class FinaCustomerApplicationImpl extends FlowBroker implements FinaCusto
CompanyCodeVo companyCodeVo = new CompanyCodeVo();
ClassHelper.copyProperties(finaCustomerPay, companyCodeVo);
companyCodeVo.setAkont(finaCustomerPay.getAkontCustomer());
//前置补零
// DecimalFormat g1=new DecimalFormat("000");
// String startZeroStr = g1.format(Integer.valueOf(i+1));
// companyCodeVo.setZuawa(startZeroStr);
if ("0".equals(companyCodeVo.getSperrB())){
companyCodeVo.setSperrB("");
}
......
topsun/src/main/java/com/huigou/topsun/sap/finaCustomer/controller/FinaCustomerController.java
View file @ e5bd92d0
......@@ -59,7 +59,7 @@ public class FinaCustomerController extends CommonController {
String flag=sdo.getString("flag");
FinaCustomerInfo finaCustomerInfo = new FinaCustomerInfo();
finaCustomerInfo.setCreationGroup("C006");//分组： 默认【C006】，不可更改
finaCustomerInfo.setPartnerRole("FLCU00");//业务伙伴角色 默认【FLCU00】，不可更改
finaCustomerInfo.setPartnerRole("");//业务伙伴角色
finaCustomerInfo.setApplyType("0");
String isDel=sdo.getString("isDel");
String page = "finaCustomerDetail";
......
topsun/src/main/java/com/huigou/topsun/sap/finaCustomer/domain/FinaCustomerInfo.java
View file @ e5bd92d0
......@@ -154,6 +154,18 @@ public class FinaCustomerInfo extends FlowBillAbstractEntity {
@Column(name = "stenr")
private String stenr;
/**
* 税号类比
*/
@Column(name = "tax_type")
private String taxType;
/**
* 税号类比
*/
@Column(name = "tax_type_name")
private String taxTypeName;
/**
* 中心记帐冻结
*/
......
topsun/src/main/java/com/huigou/topsun/sap/finaCustomer/domain/FinaCustomerPay.java
View file @ e5bd92d0
......@@ -52,6 +52,12 @@ public class FinaCustomerPay implements Serializable {
@Column(name = "zuawa")
private String zuawa;
/**
* 根据分配号排序代码
*/
@Column(name = "zuawa_name")
private String zuawaName;
/**
* 付款条件代码
*/
......
topsun/src/main/java/com/huigou/topsun/syncOrg/vo/SapPersonVo/MdClientSapVo.java
View file @ e5bd92d0
......@@ -57,7 +57,7 @@ public class MdClientSapVo {
* 税号类比
*/
@JsonProperty("TAXTYPE")
private String taxtype;
private String taxType;
/**
* 税号
*/
......
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