Skip to content

T
topsun-bpm
Commit 2efa6cf6 authored by 刘学辉's avatar 刘学辉
Browse files
Options

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

parents 951a019d cad579bb
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 18 deletions
huigou-xt/src/main/webapp/system/opm/organization/Org.js
View file @ 2efa6cf6
......@@ -536,6 +536,21 @@ function initPersonDialog() {
$('#regionName').val(data.BEZEI);
}
});
$('#bankCode').searchbox({
type: "system", name: "getBankInfo",
getParam: function (item) {
if (Public.isBlank($('#bankCountry').val())){
Public.tip("请先选择银行所属国家")
return false;
}
return {
BANKS: $('#bankCountry').val(),
}
},
onChange: function (value, data) {
$('#bankCode').val(data.BANKL);
}
});
}
function sapMesShow(){
......
huigou-xt/src/main/webapp/system/opm/organization/PersonDetail.jsp
View file @ 2efa6cf6
......@@ -50,7 +50,7 @@
<x:selectC dictionary="country" name="bankCountry" label="银行所属国家" labelCol="2" fieldCol="4" />
</div>
<div class="col-md-4">
<x:inputC name="bankCode" label="银行代码" labelCol="4" fieldCol="8" />
<x:inputC name="bankCode" label="银行代码" labelCol="4" fieldCol="8" wrapper="select"/>
</div>
</div>
<div class="hg-form-row">
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsMove/sapFixedAssetsMoveDetail.js
View file @ 2efa6cf6
......@@ -11,7 +11,7 @@ function initialize(){
borderTopWidth : 0
});
$('#sapAssessMoveList').fileList({
bizId : $("#attbizId").val()
bizId : $("#id").val()
});
UICtrl.layout("#layout", {leftWidth: 3});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsMove/sapFixedAssetsMoveDetail.jsp
View file @ 2efa6cf6
......@@ -32,7 +32,7 @@
<div id="maingrid" style="margin: 2px;">
</div>
<div style="padding-top: 15px;">
<x:fileList bizCode="sapAssessMove" bizId="attbizId" id="sapAssessMoveList" title="相关资料" />
<x:fileList bizCode="sapAssessMove" bizId="id" id="sapAssessMoveList" title="相关资料" />
</div>
</form>
</body>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageDetail.js
View file @ 2efa6cf6
......@@ -5,6 +5,8 @@ $(document).ready(function () {
function initializateUI() {
UICtrl.layout("#layout", {leftWidth: 3});
var isCharge = $("#isCharge").val();
amountController(isCharge)
}
function bindEvent() {
......@@ -43,8 +45,21 @@ function bindEvent() {
$('#unitName').val(data.MSEHL);
}
});
$("#isCharge").combox({onChange:function(data){
amountController(data.value)
}
})
}
function amountController(value){
if ("1" == value){
UICtrl.setElHideOrShow("#amount",false)
UICtrl.setElRequiredFlag("#amount",true);
}else {
UICtrl.setElRequiredFlag("#amount",false);
UICtrl.setElHideOrShow("#amount",true)
}
}
function setId(value) {
$('#id').val(value);
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageDetail.jsp
View file @ 2efa6cf6
......@@ -8,7 +8,7 @@
</head>
<body>
<div class="container-fluid">
<x:billTitle title="无订单库存入库" needStatus="false" needPerson="true"/>
<x:billTitle title="无订单库存入库情况说明" needStatus="false" needPerson="true"/>
<div class="blank_div clearfix"></div>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
......@@ -40,8 +40,9 @@
</div>
<div class="hg-form-row">
<x:inputC name="werksName" required="true" label="工厂" labelCol="1" wrapper="select" fieldCol="2"/>
<x:inputC name="storeName" required="true" label="库存地点" labelCol="1" wrapper="select" fieldCol="2"/>
<x:inputC name="storeName" required="false" label="库存地点" labelCol="1" wrapper="select" fieldCol="2"/>
<x:inputC name="supplier" required="true" label="供应商" labelCol="1" fieldCol="2"/>
<x:inputC name="amount" required="false" label="总价值" labelCol="1" fieldCol="2" mask="positiveMoney"/>
</div>
<div class="hg-form-row">
<x:textareaC name="reason" required="true" label="事由" labelCol="1" rows="3" fieldCol="6"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageList.js
View file @ 2efa6cf6
......@@ -84,7 +84,7 @@ function updateHandler(row) {
UICtrl.addTabItem({
tabid: 'nonOrderStorageDetail',
text: "查看无订单库存入库",
url: web_app.name + '/nonOrderStorage/showNonOrderStorageDetail.job?isReadOnly=true&id=' + row.id
url: web_app.name + '/nonOrderStorage/showNonOrderStorageDetail.job?isReadOnly=true&bizId=' + row.id
})
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js
View file @ 2efa6cf6
......@@ -46,9 +46,10 @@ function getGridColumns() {
{display: "库存地点", name: "lgort", width: "100", align: "left", type: "string"},
{display: "库存地点的描述", name: "lgobe", width: "200", align: "left", type: "string"},
{display: "含税单价", name: "netpr", width: "100", align: "left", type: "string"},
{display: "价格单位", name: "peinh", width: "100", align: "left", type: "string"},
{display: "税码", name: "mwskz", width: "100", align: "left", type: "string"},
{display: "含税总价", name: "netwr", width: "100", align: "left", type: "string"},
{display: "价格基数", name: "peinh", width: "100", align: "left", type: "string"},
//{display: "税码", name: "mwskz", width: "100", align: "left", type: "string"},
{display: "进项税率(%)", name: "kbetr", width: "100", align: "left", type: "string"},
{display: "含税总额", name: "netwr", width: "100", align: "left", type: "string"},
{display: "退货项目", name: "retpo", width: "100", align: "left", type: "string"},
{display: "总账科目", name: "sakto", width: "100", align: "left", type: "string"},
{display: "成本中心", name: "kostl", width: "200", align: "left", type: "string"},
......
topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js
View file @ 2efa6cf6
......@@ -126,6 +126,9 @@ function getGridColumns() {
// },
// }
},
{display: "供应商名称", name: "lifnrName", width: "200", align: "left", type: "string",
editor: {required: false, type: "text"}
},
{display: "物料编码", name: "matnr", width: "200", align: "left", type: "string",
editor: {
required: false, type: "select",
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js
View file @ 2efa6cf6
......@@ -409,7 +409,24 @@ function loadSuppliersBankListGrid() {
},
{
display: "银行代码", name: "bankl", width: 200, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true }
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "getBankInfo",
getParam: function (item) {
return {BANKS: item.banks}
},
back: {
BANKL: "bankl",
BANKA: "banka",
}
},
}
},
{
display: "银行名称", name: "banka", width: 300, minWidth: 60, type: "String", align: "left",
//editor: {type: 'text', required: false}
},
{
display: "银行帐户号码", name: "bankn", width: 200, minWidth: 60, type: "String", align: "left",
......@@ -431,10 +448,6 @@ function loadSuppliersBankListGrid() {
display: "对方开户行类型", name: "bvtyp", width: 160, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: false}
},
{
display: "银行名称", name: "banka", width: 200, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: false}
},
{
display: "分行", name: "brnch", width: 200, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: false}
......
topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java
View file @ 2efa6cf6
......@@ -4,10 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.cache.DictUtil;
import com.huigou.topsun.sap.sapApplication.application.SapAreaApplication;
import com.huigou.topsun.sap.sapApplication.application.SapDictionaryApplication;
import com.huigou.topsun.sap.sapApplication.application.SapMaterialApplication;
import com.huigou.topsun.sap.sapApplication.application.SapPaymentApplication;
import com.huigou.topsun.sap.sapApplication.application.*;
import com.huigou.topsun.sap.sapApplication.domain.query.SapDialogQuery;
import com.huigou.topsun.util.SAPUtils;
import com.huigou.uasp.annotation.ControllerMapping;
......@@ -48,6 +45,8 @@ public class ResourceSearchController {
private SapAreaApplication sapAreaApplication;
@Autowired
private DictionaryApplication dictionaryApplication;
@Autowired
private SapBankInfoApplication sapBankInfoApplication;
@EasySearch(queryName = "knttp")
public Map<String, Object> knttpSelect(SDO sdo){
......@@ -333,6 +332,15 @@ public class ResourceSearchController {
return this.initEasySearchModel( mapList, param, sdo);
}
@EasySearch(queryName = "getBankInfo")
public Map<String, Object> getBankInfo(SDO sdo) throws IOException {
String param = sdo.getString("paramValue");
String BANKS = sdo.getString("BANKS");
List<Map<String, String>> mapList = new ArrayList<>();
mapList = sapBankInfoApplication.getBankInfo(BANKS);
return this.initEasySearchModel( mapList, param, sdo);
}
public Map<String,Object> initEasySearchModel(List<Map<String, String>> mapList,String param,SDO sdo){
List<QuerySchemeField> fields = new ArrayList<>();
if (CollectionUtil.isNotEmpty(mapList)){
......
topsun/src/main/java/com/huigou/topsun/sap/nonOrderStorage/domain/NonOrderStorage.java
View file @ 2efa6cf6
......@@ -97,6 +97,12 @@ public class NonOrderStorage extends FlowBillAbstractEntity {
@Column(name = "message")
private String message;
/**
* 总价值
*/
@Column(name = "amount")
private BigDecimal amount;
@Override
protected String getCodeRuleId() {
return "nonOrderStorage";
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrderItem.java
View file @ 2efa6cf6
......@@ -147,6 +147,12 @@ public class SapPurchaseOrderItem extends AbstractEntity {
@Column(name = "MWSKZ")
private String mwskz;
/**
* 税率
*/
@Column(name = "KBETR")
private String kbetr;
/**
* 总价
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderItemVo.java
View file @ 2efa6cf6
......@@ -71,6 +71,9 @@ public class SapPurchaseOrderItemVo {
@JsonProperty("MWSKZ")
private String mwskz;
@JsonProperty("KBETR")
private String kbetr;
@JsonProperty("NETWR")
private Double netwr;
......
topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/domain/vo/SapQualityInfoRecordItemVo.java
View file @ 2efa6cf6
......@@ -45,6 +45,12 @@ public class SapQualityInfoRecordItemVo implements Serializable {
@JsonProperty("LIEFERANT")
private String lieferant;
/**
* 供应商名称
*/
@JsonProperty("ZMMVENNAME")
private String lifnrName;
/**
* 合格准入验证节点1
*/
......
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/SapBankInfoApplication.java 0 → 100644
View file @ 2efa6cf6
package com.huigou.topsun.sap.sapApplication.application;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/04/09/15:03
* @Description:
*/
public interface SapBankInfoApplication {
/**
* 根据银行国家代码查询银行信息
* @param BANKS
* @return
* @throws IOException
*/
List<Map<String,String>> getBankInfo(String BANKS) throws IOException;
}
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapBankInfoApplicationImpl.java 0 → 100644
View file @ 2efa6cf6
package com.huigou.topsun.sap.sapApplication.application.impl;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.topsun.sap.common.HttpClient;
import com.huigou.topsun.sap.common.domain.SapResult;
import com.huigou.topsun.sap.sapApplication.application.SapBankInfoApplication;
import com.huigou.topsun.util.SAPUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Auther: xin.lu
* @Date: 2024/04/09/15:04
* @Description:
*/
@Service("sapBankInfoApplication")
public class SapBankInfoApplicationImpl implements SapBankInfoApplication {
@Autowired
private HttpClient httpClient;
@Override
public List<Map<String, String>> getBankInfo(String BANKS) throws IOException {
Map<String,String> param = new HashMap<>();
param.put("BANKS",BANKS);
List<Map<String,String>> paramList = new ArrayList<>();
paramList.add(param);
String execute = null;
List<Map<String,String>> mapList = new ArrayList<>();
try {
execute = httpClient.execute(paramList, "search/sch_bank_info");
Map<String, String> map = JSONObject.parseObject(execute, Map.class);
List<SapResult> sapResultList = JSONObject.parseArray(JSONUtil.toJsonStr(map.get("MSG")), SapResult.class);
if ("S".equals(sapResultList.get(0).getTYPE())) {
ObjectMapper objectMapper = SAPUtils.objectMapper();
mapList = objectMapper.readValue(com.huigou.util.JSONUtil.toString(map.get("RDATA")), new TypeReference<List<Map<String, String>>>() {});
}
} catch (IOException e) {
throw new RuntimeException("根据银行国家代码查询银行信息出错。");
}
return mapList;
}
}
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