Skip to content

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

质量信息记录优化；采购申请优化

parent a75b4993
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 173 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costCenter/sapCostCenterList.js
View file @ d5307d39
......@@ -47,6 +47,7 @@ function loadCostCenterListGrid() {
{display: "有限期自", name: "datbi", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "有限截止日", name: "datab", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "负责人", name: "verak", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "层次结构范围", name: "khinr", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "利润中心", name: "prctrTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "申请人", name: "personMemberName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "申请部门", name: "deptName", width: 140, minWidth: 60, type: "string", align: "left"},
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js
View file @ d5307d39
......@@ -45,11 +45,13 @@ function initAufnr(knttp){
return false;
})
if ("K" == knttp){
if (Public.isNotBlank(itemGridManager.currentData)){
var rows = itemGridManager.currentData.Rows;
rows.forEach(row =>{
itemGridManager.updateRow(row,{aufnr:""})
})
}
}
columns.splice(0,2)
UICtrl.setGridColumns(itemGridManager,columns);
}
......@@ -337,41 +339,41 @@ function getGridColumns() {
}
//editor: {type: 'text'}
},);
columns.push({
display: "会计分配序号", name: "zebkn", width: "100", align: "left", type: "string",
editor: {type: 'text'},
render: function (item) {
//申购项次为消耗性采购时，从1开始步长为1自动编号，最大99
// if (item.knttp != ''){
// ZEBKN_NUM = ZEBKN_NUM + 1;
// }
return item.zebkn = item.menge;
}
},);
columns.push({
display: "多重科目分配", name: "vrtkz", width: "100", align: "left", type: "string",
//editor: {type: 'text'},
// render: function (item) {
// //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// if (item.knttp == "A" && item.menge > 1) {
// return item.vrtkz = 1;
// }
// }
},);
columns.push({
display: "部分发票", name: "twrkz", width: "100", align: "left", type: "string",
editor: {type: 'text'},
// columns.push({
// display: "会计分配序号", name: "zebkn", width: "100", align: "left", type: "string",
// editor: {type: 'text'},
// render: function (item) {
// //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// if (item.knttp == "A" && item.menge > 1) {
// return item.twrkz = 1;
// }
// //申购项次为消耗性采购时，从1开始步长为1自动编号，最大99
// // if (item.knttp != ''){
// // ZEBKN_NUM = ZEBKN_NUM + 1;
// // }
// return item.zebkn = item.menge;
// }
},);
columns.push({
display: "PR分解数量", name: "ekbnMenge", width: "100", align: "left", type: "string",
editor: {type: 'text'}
},);
// },);
// columns.push({
// display: "多重科目分配", name: "vrtkz", width: "100", align: "left", type: "string",
// //editor: {type: 'text'},
// // render: function (item) {
// // //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// // if (item.knttp == "A" && item.menge > 1) {
// // return item.vrtkz = 1;
// // }
// // }
// },);
// columns.push({
// display: "部分发票", name: "twrkz", width: "100", align: "left", type: "string",
// editor: {type: 'text'},
// // render: function (item) {
// // //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// // if (item.knttp == "A" && item.menge > 1) {
// // return item.twrkz = 1;
// // }
// // }
// },);
// columns.push({
// display: "PR分解数量", name: "ekbnMenge", width: "100", align: "left", type: "string",
// editor: {type: 'text'}
// },);
// columns.push({
// display: "总账科目", name: "sakto", width: "100", align: "left", type: "string",
// editor: {type: 'text', required: true}
......@@ -394,23 +396,23 @@ function getGridColumns() {
},);
columns.push({
display: "订单号", name: "aufnr", width: "200", align: "left", type: "string",
//editor: {type: 'text'}
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "getCompanyOrders",
getParam: function (item) {
return {
BUKRS: '1000'
}
},
back: {
AUFNR: "aufnr",
KTEXT: "ktext"
}
},
}
editor: {type: 'text',required: false,}
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "getCompanyOrders",
// getParam: function (item) {
// return {
// BUKRS: '1000'
// }
// },
// back: {
// AUFNR: "aufnr",
// KTEXT: "ktext"
// }
// },
// }
});
columns.push({
display: "审批处理状态", name: "banpr", width: "100", align: "left", type: "string",
......
topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js
View file @ d5307d39
......@@ -11,7 +11,10 @@ function bindEvent() {
function initItemGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function(){
UICtrl.addGridRow(itemGridManager);
UICtrl.addGridRow(itemGridManager,{
zvdatab: $("#fillinDate").val()
}
);
},
deleteHandler: function (){
var _grid = UICtrl.getGridManager('#maingrid');
......@@ -62,6 +65,22 @@ function initItemGrid() {
return true;
},
onAfterShowData: function (datas) {
if (Public.isNotBlank($("#tempId").val())){
$.each(datas.Rows,function(i,data){
itemGridManager.updateRow(data,{
zqinfno:"",
zqavfn1:"",
zvfnc1:"",
zqavfn2:"",
zvfnc2:"",
zqavfn3:"",
zvfnc3:"",
zqafst:"",
})
});
}
}
}
);
UICtrl.setSearchAreaToggle(itemGridManager);
......@@ -216,10 +235,10 @@ function getGridColumns() {
editor: {type: "text"}
},
{display: "合格有效期从", name: "zvdatab", width: "150", minWidth: 60, type: "date", align: "center",
editor: {type: 'date'},
editor: {type: 'date',required: true},
},
{display: "合格有效期到", name: "zvdatai", width: "150", minWidth: 60, type: "date", align: "center",
editor: {type: "date"}
editor: {type: "date",required: true}
},
{display: "备注文本", name: "ztext", width: "120", align: "left", type: "string",
editor: {type: 'text'}
......
topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/vo/SapPurchaseItemVo.java
View file @ d5307d39
package com.huigou.topsun.sap.purchase.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
......@@ -10,7 +11,7 @@ import java.math.BigDecimal;
* @Date: 2024/01/02/14:07
* @Description:
*/
@Data
public class SapPurchaseItemVo implements Serializable {
/**
* 需求跟踪号
......@@ -183,8 +184,8 @@ public class SapPurchaseItemVo implements Serializable {
/**
* 评估价格
*/
//@JsonProperty("PREIS")
//private BigDecimal preis;
@JsonProperty("netwr")
private BigDecimal preis;
/**
* 价格基数
......@@ -264,112 +265,4 @@ public class SapPurchaseItemVo implements Serializable {
//@JsonProperty("banpr")
//private String banpr;
public void setBillCode(String billCode) {
this.billCode = billCode;
}
public void setBnfpo(Integer bnfpo) {
this.bnfpo = bnfpo;
}
public void setPstyp(String pstyp) {
this.pstyp = pstyp;
}
public void setKnttp(String knttp) {
this.knttp = knttp;
}
public void setWerks(String werks) {
this.werks = werks;
}
public void setLgort(String lgort) {
this.lgort = lgort;
}
public void setMatnr(String matnr) {
this.matnr = matnr;
}
public void setTxz01(String txz01) {
this.txz01 = txz01;
}
public void setMatkl(String matkl) {
this.matkl = matkl;
}
public void setMenge(BigDecimal menge) {
this.menge = menge;
}
public void setMeins(String meins) {
this.meins = meins;
}
public void setEkgrp(String ekgrp) {
this.ekgrp = ekgrp;
}
public void setBadat(String badat) {
this.badat = badat;
}
public void setErdat(String erdat) {
this.erdat = erdat;
}
public void setFrgdt(String frgdt) {
this.frgdt = frgdt;
}
public void setLfdat(String lfdat) {
this.lfdat = lfdat;
}
public void setErnam(String ernam) {
this.ernam = ernam;
}
public void setAfnam(String afnam) {
this.afnam = afnam;
}
public void setWaers(String waers) {
this.waers = waers;
}
public void setZebkn(Integer zebkn) {
this.zebkn = zebkn;
}
public void setVrtkz(String vrtkz) {
this.vrtkz = vrtkz;
}
public void setTwrkz(String twrkz) {
this.twrkz = twrkz;
}
public void setSakto(String sakto) {
this.sakto = sakto;
}
public void setKostl(String kostl) {
this.kostl = kostl;
}
public void setAufnr(String aufnr) {
this.aufnr = aufnr;
}
public void setAnln1(String anln1) {
this.anln1 = anln1;
}
public void setAnln2(String anln2) {
this.anln2 = anln2;
}
}
topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/application/impl/SapQualityInfoRecordApplicationImpl.java
View file @ d5307d39
......@@ -154,9 +154,9 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
purchaseInfoRecordItemList.forEach(sapQualityInfoRecordItem -> {
SapQualityInfoRecordItemVo sapQualityInfoRecordItemVo = new SapQualityInfoRecordItemVo();
BeanUtil.copyProperties(sapQualityInfoRecordItem, sapQualityInfoRecordItemVo);
// sapQualityInfoRecordItem.setZqavfn3("M1");
// sapQualityInfoRecordItem.setZvfnc3("A");
// sapQualityInfoRecordItem.setZqafst("11");
sapQualityInfoRecordItem.setZqavfn3("M1");
sapQualityInfoRecordItem.setZvfnc3("A");
sapQualityInfoRecordItem.setZqafst("11");
if ("0".equals(sapQualityInfoRecordItemVo.getGrsrq())){
sapQualityInfoRecordItemVo.setGrsrq("");
}
......
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