Skip to content

T
topsun-bpm
Commit 79429ee9 authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

成本中心BUG修改

parent 86c98d1f
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 72 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costCenter/sapCostCenterDetail.jsp
View file @ 79429ee9
......@@ -32,14 +32,14 @@
<x:hidden name="personMemberName"/>
<x:hidden name="statusId"/>
<div class="hg-form-row">
<x:inputC name="KOSTL" required="true" label="成本中心编码" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="KTEXT" required="true" label="名称" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="LTEXT" required="true" label="描述" labelCol="2" maxLength="64" fieldCol="4"/>
<x:selectC name="KOSAR" required="false" label="成本中心类型" labelCol="2" dictionary="KOSAR" fieldCol="4"/>
<x:inputC name="DATAB" required="true" label="有限期自" labelCol="2" wrapper="date" fieldCol="4" value="2024-01-01"/>
<x:inputC name="DATBI" required="true" label="有限截止日" labelCol="2" wrapper="date" fieldCol="4" value="9999-12-31"/>
<x:inputC name="VERAK" required="true" label="负责人" labelCol="2" maxLength="64" fieldCol="4"/>
<x:selectC name="PRCTR" required="true" label="利润中心" labelCol="2" dictionary="PRCTR" fieldCol="4"/>
<x:inputC name="kostl" required="true" label="成本中心编码" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="ktext" required="true" label="名称" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="ltext" required="true" label="描述" labelCol="2" maxLength="64" fieldCol="4"/>
<x:selectC name="kosar" required="false" label="成本中心类型" labelCol="2" dictionary="KOSAR" fieldCol="4"/>
<x:inputC name="datab" required="true" label="有限期自" labelCol="2" wrapper="date" fieldCol="4" value="2024-01-01"/>
<x:inputC name="datbi" required="true" label="有限截止日" labelCol="2" wrapper="date" fieldCol="4" value="9999-12-31"/>
<x:inputC name="verak" required="true" label="负责人" labelCol="2" maxLength="64" fieldCol="4"/>
<x:selectC name="prctr" required="true" label="利润中心" labelCol="2" dictionary="PRCTR" fieldCol="4"/>
<x:selectC name="formType" required="true" label="业务类型" labelCol="2" dictionary="formType" fieldCol="4"/>
<x:inputC name="reason" required="true" label="原因" labelCol="2" maxLength="255" fieldCol="4"/>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsDetail.js
View file @ 79429ee9
......@@ -13,9 +13,7 @@ function bindQueryEvent() {
$('#kostl').searchbox({
type: "costCenter", name: "costCenterCode",
onChange: function (value, data) {
$('#kostl').val(data.KOSTL);
// ajaxRenderDataGoForm(data.kostl);
// showTable({proofingApplyId:data.proofingApplyId});
$('#kostl').val(data.kostl);
}
});
}
......
topsun/src/main/java/com/huigou/topsun/sap/costCenter/application/impl/CostCenterApplicationImpl.java
View file @ 79429ee9
......@@ -34,8 +34,8 @@ public class CostCenterApplicationImpl extends FlowBroker implements CostCenterA
public Map<String, Object> getCostCenterList(CostCenterQueryRequest costCenterQueryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "costCenter");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, costCenterQueryRequest);
queryModel.putDictionary("KOSAR", DictUtil.getDictionary("KOSAR"));
queryModel.putDictionary("PRCTR", DictUtil.getDictionary("PRCTR"));
queryModel.putDictionary("kosar", DictUtil.getDictionary("KOSAR"));
queryModel.putDictionary("prctr", DictUtil.getDictionary("PRCTR"));
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
return map;
}
......
topsun/src/main/java/com/huigou/topsun/sap/costCenter/controller/CostCenterController.java
View file @ 79429ee9
......@@ -6,8 +6,6 @@ import com.huigou.topsun.sap.costCenter.application.CostCenterApplication;
import com.huigou.topsun.sap.costCenter.domain.CostCenter;
import com.huigou.topsun.sap.costCenter.domain.query.CostCenterQueryRequest;
import com.huigou.topsun.sap.costCenter.domain.vo.CostCenterVo;
import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssets;
import com.huigou.topsun.sap.fixedAssets.domain.vo.SapFixedAssetsVo;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
......
topsun/src/main/java/com/huigou/topsun/sap/costCenter/domain/CostCenter.java
View file @ 79429ee9
......@@ -22,38 +22,38 @@ public class CostCenter extends FlowBillAbstractEntity {
/**
* 成本中心编码
*/
@Column(name = "KOSTL")
private String KOSTL;
@Column(name = "kostl")
private String kostl;
/**
* 有效期自 默认当年1月1日
*/
@Column(name = "DATAB")
private Date DATAB;
@Column(name = "datab")
private Date datab;
/**
* 有效截至日 默认9999.12.31
*/
@Column(name = "DATBI")
private Date DATBI;
@Column(name = "datbi")
private Date datbi;
/**
* 名称
*/
@Column(name = "KTEXT")
private String KTEXT;
@Column(name = "ktext")
private String ktext;
/**
* 描述
*/
@Column(name = "LTEXT")
private String LTEXT;
@Column(name = "ltext")
private String ltext;
/**
* 负责人
*/
@Column(name = "VERAK")
private String VERAK;
@Column(name = "verak")
private String verak;
/**
* 成本中心类型
......@@ -63,18 +63,18 @@ public class CostCenter extends FlowBillAbstractEntity {
* 间接生产类 G
* 直接生产类 F
*/
@Column(name = "KOSAR")
@Column(name = "kosar")
@Dictionary("KOSAR")
private String KOSAR;
private String kosar;
/**
* 利润中心
* 10001000 广州宝绅科技利润中心
* 10001001 广州宝绅RFID利润中心
*/
@Column(name = "PRCTR")
@Column(name = "prctr")
@Dictionary("PRCTR")
private String PRCTR;
private String prctr;
/**
* 业务类型
......
topsun/src/main/java/com/huigou/topsun/sap/costCenter/domain/query/CostCenterQueryRequest.java
View file @ 79429ee9
......@@ -22,32 +22,32 @@ public class CostCenterQueryRequest extends QueryAbstractRequest {
/**
* 成本中心编码
*/
private String KOSTL;
private String kostl;
/**
* 有效期自 默认当年1月1日
*/
private Date DATAB;
private Date datab;
/**
* 有效截至日 默认9999.12.31
*/
private Date DATBI;
private Date datbi;
/**
* 名称
*/
private String KTEXT;
private String ktext;
/**
* 描述
*/
private String LTEXT;
private String ltext;
/**
* 负责人
*/
private String VERAK;
private String verak;
/**
* 成本中心类型
......@@ -57,14 +57,14 @@ public class CostCenterQueryRequest extends QueryAbstractRequest {
* 间接生产类 G
* 直接生产类 F
*/
private String KOSAR;
private String kosar;
/**
* 利润中心
* 10001000 广州宝绅科技利润中心
* 10001001 广州宝绅RFID利润中心
*/
private String PRCTR;
private String prctr;
/**
* 业务类型
......
topsun/src/main/java/com/huigou/topsun/sap/costCenter/domain/vo/CostCenterVo.java
View file @ 79429ee9
......@@ -26,32 +26,32 @@ public class CostCenterVo implements Serializable {
/**
* 成本中心编码
*/
private String KOSTL;
private String kostl;
/**
* 有效期自 默认当年1月1日
*/
private Date DATAB;
private Date datab;
/**
* 有效截至日 默认9999.12.31
*/
private Date DATBI;
private Date datbi;
/**
* 名称
*/
private String KTEXT;
private String ktext;
/**
* 描述
*/
private String LTEXT;
private String ltext;
/**
* 负责人
*/
private String VERAK;
private String verak;
/**
* 成本中心类型
......@@ -61,14 +61,14 @@ public class CostCenterVo implements Serializable {
* 间接生产类 G
* 直接生产类 F
*/
private String KOSAR;
private String kosar;
/**
* 利润中心
* 10001000 广州宝绅科技利润中心
* 10001001 广州宝绅RFID利润中心
*/
private String PRCTR;
private String prctr;
/**
* 业务类型
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/SapFixedAssets.java
View file @ 79429ee9
......@@ -18,70 +18,70 @@ public class SapFixedAssets extends FlowBillAbstractEntity {
* BPM单号
*/
@Column(name = "ZBPMN")
@Column(name = "zbpmn")
private String zbpmn;
/**
* 创建标识
* 用于标识数据是新增或修改，1为新增，2为修改。（必填）
*/
@Column(name = "ZFLG")
@Column(name = "zflg")
private Integer zflg;
/**
* 主资产号
;资产编号内部生成，当创建标识为2，即修改时，主资产号为必输。
*/
@Column(name = "ANLN1")
@Column(name = "anln1")
private String anln1;
/**
* 资产分类
* 当创建标识为1，即创建时，资产分类必输。
*/
@Column(name = "ANLKL")
@Column(name = "anlkl")
private String anlkl;
/**
* 公司代码（必填）
*/
@Column(name = "BUKRS")
@Column(name = "bukrs")
private String bukrs;
/**
* 文本（必填）
*/
@Column(name = "TXT50")
@Column(name = "txt50")
private String txt50;
/**
* 存货号；存放地点
*/
@Column(name = "INVNR")
@Column(name = "invnr")
private String invnr;
/**
* 数量
*/
@Column(name = "MENGE")
@Column(name = "menge")
private BigDecimal menge;
/**
* 基本计量单位
*/
@Column(name = "MEINS")
@Column(name = "meins")
private String meins;
/**
* 成本中心（必填）
*/
@Column(name = "KOSTL")
@Column(name = "kostl")
private String kostl;
/**
* 责任成本中心
*/
@Column(name = "KOSTLV")
@Column(name = "kostlv")
private String kostlv;
private static final long serialVersionUID = 1L;
......
topsun/src/main/resources/config/content/easysearch/easy-search-costCenter.xml
View file @ 79429ee9
......@@ -5,25 +5,25 @@
<sql>
SELECT
scc.id,
scc.KOSTL,
scc.KTEXT,
scc.LTEXT,
scc.VERAK,
scc.KOSAR,
scc.PRCTR,
scc.kostl,
scc.ktext,
scc.ltext,
scc.verak,
scc.kosar,
scc.prctr,
scc.t
FROM
( SELECT *,NOW() AS t FROM sap_cost_center ) AS scc
WHERE
scc.t &gt;= scc.DATAB
AND scc.t &lt;= scc.DATBI
scc.t &gt;= scc.datab
AND scc.t &lt;= scc.datbi
</sql>
<field name="成本中心编码" title="成本中心编码" code="KOSTL" width="200"/>
<field name="名称" title="名称" code="KTEXT" width="200"/>
<field name="负责人" title="负责人" code="VERAK" width="200"/>
<field name="成本中心类型" title="成本中心类型" code="KOSAR" width="200" type="hidden"/>
<field name="利润中心" title="利润中心" code="PRCTR" width="200" type="hidden"/>
<condition column="KTEXT" name="KTEXT" symbol="like"
<field name="成本中心编码" title="成本中心编码" code="kostl" width="200"/>
<field name="名称" title="名称" code="ktext" width="200"/>
<field name="负责人" title="负责人" code="verak" width="200"/>
<field name="成本中心类型" title="成本中心类型" code="kosar" width="200" type="hidden"/>
<field name="利润中心" title="利润中心" code="prctr" width="200" type="hidden"/>
<condition column="ktext" name="ktext" symbol="like"
alias="scc"/>
</easy-search>
......
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