Commit a6556a91 authored by 1650842865's avatar 1650842865

采购信息记录增加包装费字段

parent c4e69eea
...@@ -31,24 +31,6 @@ function initialize(){ ...@@ -31,24 +31,6 @@ function initialize(){
} }
/**
* 流程引擎回调设置打样的id
* @param value 打样申请的id
*/
function setId(id) {
// $("#id").val(id);
}
/**
* 流程引擎获取打样申请id的回掉方法。
* @return 打样申请的id
*/
function getId() {
var id=$("#id").val() || "";
return id;
}
function disableForm(formId,isDisabled) { function disableForm(formId,isDisabled) {
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<x:inputC name="netpr" label="净价" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/> <x:inputC name="netpr" label="净价" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
<x:inputC name="freight" label="运输费" labelCol="1" fieldCol="2" required="false" mask="99999999.99"/> <x:inputC name="freight" label="运输费" labelCol="1" fieldCol="2" required="false" mask="99999999.99"/>
<x:inputC name="kbetr6" label="包装费" labelCol="1" fieldCol="2" required="false" mask="99999999.99"/>
<x:hidden name="matkl"/> <x:hidden name="matkl"/>
<x:inputC name="matklName" label="物料组" labelCol="1" fieldCol="2" wrapper="select" /> <x:inputC name="matklName" label="物料组" labelCol="1" fieldCol="2" wrapper="select" />
......
var itemGridManager = null,fillinDate=""; var itemGridManager = null,fillinDate="";
$(function () { $(document).ready(function () {
initialize();
initItemGrid(); initItemGrid();
bindEvent(); bindEvent();
}); });
function initialize() {
UICtrl.layout("#layout", {leftWidth: 3});
}
function bindEvent() { function bindEvent() {
fillinDate = $("#fillinDate").val(); fillinDate = $("#fillinDate").val();
...@@ -247,6 +251,9 @@ function getGridColumns() { ...@@ -247,6 +251,9 @@ function getGridColumns() {
{display: "运输费", name: "freight", width: "100", align: "left", type: "string" {display: "运输费", name: "freight", width: "100", align: "left", type: "string"
//,editor: {required: true,type: 'text', mask: '9999999.99'} //,editor: {required: true,type: 'text', mask: '9999999.99'}
}, },
{display: "包装费", name: "kbetr6", width: "100", align: "left", type: "string"
//,editor: {required: true,type: 'text', mask: '9999999.99'}
},
{display: "货币码编号", name: "waers", width: "20", align: "left", type: "string",hide:true}, {display: "货币码编号", name: "waers", width: "20", align: "left", type: "string",hide:true},
{display: "货币码", name: "waersTextView", width: "100", align: "left", type: "string" {display: "货币码", name: "waersTextView", width: "100", align: "left", type: "string"
/*,editor: { /*,editor: {
...@@ -592,6 +599,7 @@ function doSaveDefine() { ...@@ -592,6 +599,7 @@ function doSaveDefine() {
ekgrpName: $("#ekgrpName").val(), ekgrpName: $("#ekgrpName").val(),
netpr: $("#netpr").val(), netpr: $("#netpr").val(),
freight: $("#freight").val(), freight: $("#freight").val(),
kbetr6: $("#kbetr6").val(),
waers: $("#waers").val(), waers: $("#waers").val(),
waersTextView: $("#waers").find("option:selected").text(), waersTextView: $("#waers").find("option:selected").text(),
peinh: $("#peinh").val(), peinh: $("#peinh").val(),
......
...@@ -63,6 +63,7 @@ function initPurchaseListGrid() { ...@@ -63,6 +63,7 @@ function initPurchaseListGrid() {
{display: "采购组", name: "ekgrpName", width: "200", align: "left", type: "string"}, {display: "采购组", name: "ekgrpName", width: "200", align: "left", type: "string"},
{display: "净价", name: "netpr", width: "100", align: "left", type: "string"}, {display: "净价", name: "netpr", width: "100", align: "left", type: "string"},
{display: "运输费", name: "freight", width: "100", align: "left", type: "string"}, {display: "运输费", name: "freight", width: "100", align: "left", type: "string"},
{display: "包装费", name: "kbetr6", width: "100", align: "left", type: "string"},
{display: "货币码", name: "waersTextView", width: "100", align: "left", type: "string",}, {display: "货币码", name: "waersTextView", width: "100", align: "left", type: "string",},
{display: "价格单位", name: "peinh", width: "100", align: "left", type: "string"}, {display: "价格单位", name: "peinh", width: "100", align: "left", type: "string"},
{display: "订单价格单位(采购)", name: "bprmeName", width: "90", align: "left", type: "string"}, {display: "订单价格单位(采购)", name: "bprmeName", width: "90", align: "left", type: "string"},
......
...@@ -348,6 +348,12 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity { ...@@ -348,6 +348,12 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
@Column(name = "FREIGHT") @Column(name = "FREIGHT")
private BigDecimal freight; private BigDecimal freight;
/**
* 包装费
*/
@Column(name = "KBETR6")
private BigDecimal kbetr6;
/** /**
* 消息类型 * 消息类型
*/ */
......
...@@ -242,4 +242,10 @@ public class SapPurchaseInfoRecordItemVo implements Serializable { ...@@ -242,4 +242,10 @@ public class SapPurchaseInfoRecordItemVo implements Serializable {
@JsonProperty("KBETR") @JsonProperty("KBETR")
private BigDecimal freight; private BigDecimal freight;
/**
* 包装费
*/
@JsonProperty("KBETR6")
private BigDecimal kbetr6;
} }
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