Skip to content

T
topsun-bpm
Commit a99e33f4 authored by 1650842865's avatar 1650842865
Browse files
Options

领料退料查询增加实际退料数量；供应商邮件验证；付款相关修改

parent b752d5d8
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 51 deletions
topsun-xt/src/main/resources/log4j.properties
View file @ a99e33f4
......@@ -46,8 +46,8 @@ log4j.logger.org.hibernate.hql=info
#log4j.logger.org.hibernate.hql=info
#log4j.logger.org.hibernate.cache=info
log4j.logger.org.hibernate.transaction=debug
log4j.logger.org.hibernate.jdbc=debug
log4j.logger.org.hibernate.transaction=info
log4j.logger.org.hibernate.jdbc=info
#log4j.logger.org.hibernate.transaction=info
#log4j.logger.org.hibernate.jdbc=info
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @ a99e33f4
......@@ -180,7 +180,7 @@ var tableArray = [
if (item.waers === "CNY"){
money=item.kzwi1;
}else {
money=MathUtil.mul(item.kzwi1,item.kursf);
money=MathUtil.mul(item.kzwi1,item.kursf).toFixed(2);
}
return item.kzwi11 = money;
}
......@@ -215,7 +215,7 @@ var tableArray = [
}
},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
display: "原因代码", name: "rstgrName", width: 250, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
......@@ -402,9 +402,6 @@ function loadGrid(obj) {
})
obj.columns = columns;
}
// else if (obj.node==="capitalPostGrid"){
// canDelay = true;
// }
}
//资金岗
......@@ -452,7 +449,12 @@ function loadGrid(obj) {
item.gridManager.deleteRow(o);
});
})
initFinancialAuditGridData();
//initFinancialAuditGridData();
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
}
},
copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
......@@ -466,6 +468,8 @@ function loadGrid(obj) {
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
newRow.zepPtdamount1 = null;
newRow.zepPtdamount = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
......@@ -876,11 +880,11 @@ function getZepItemNo() {
function businessJudgmentUnit() {
var isApply = isApplyProcUnit();
if (isApply) {
$("#approvalMoney").hide();
$("#financialAudit").hide();
$("#financialAudit_sapReturn").hide();
$("#capitalPost").hide();
$("#paymentAccomplish_sapReturn").hide();
// $("#approvalMoney").hide();
// $("#financialAudit").hide();
// $("#financialAudit_sapReturn").hide();
// $("#capitalPost").hide();
// $("#paymentAccomplish_sapReturn").hide();
return true;
}else {
UICtrl.setDisable($("#submitForm"));
......@@ -898,15 +902,15 @@ function nodeController(){
var subProcUnitId = getSubProcUnitId();
//财务审核
if ("financeNode" === subProcUnitId){
$("#financialAudit_sapReturn").hide();
$("#capitalPost").hide();
$("#paymentAccomplish_sapReturn").hide();
// $("#financialAudit_sapReturn").hide();
// $("#capitalPost").hide();
// $("#paymentAccomplish_sapReturn").hide();
}
//资金岗
if ("fundNode" === subProcUnitId){
$("#financialAudit_sapReturn").hide();
$("#paymentAccomplish_sapReturn").hide();
// $("#financialAudit_sapReturn").hide();
// $("#paymentAccomplish_sapReturn").hide();
}
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @ a99e33f4
......@@ -589,6 +589,12 @@ function loadGrid(obj) {
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
newRow.zepPdamount1 = null;
newRow.zepPdtax1 = null;
newRow.zepPtdamount1 = null;
newRow.zepPdamount = null;
newRow.zepPdtax = null;
newRow.zepPtdamount = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
View file @ a99e33f4
......@@ -175,7 +175,7 @@ var tableArray = [
if (item.waers === "CNY"){
money=item.kzwi1;
}else {
money=MathUtil.mul(item.kzwi1,item.kursf);
money=MathUtil.mul(item.kzwi1,item.kursf).toFixed(2);
}
//totalGrid();
return item.kzwi11 = money;
......@@ -442,6 +442,8 @@ function loadGrid(obj) {
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
newRow.zepPtdamount1 = null;
newRow.zepPtdamount = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @ a99e33f4
......@@ -85,7 +85,7 @@ var tableArray = [
if (item.waers === "CNY"){
money=item.kzwi1;
}else {
money=MathUtil.mul(item.kzwi1,item.kursf);
money=MathUtil.mul(item.kzwi1,item.kursf).toFixed(2);
}
return item.kzwi11 = money;
}
......@@ -410,6 +410,8 @@ function loadGrid(obj) {
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
newRow.zepPtdamount1 = null;
newRow.zepPtdamount = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
View file @ a99e33f4
......@@ -182,7 +182,11 @@ function getColumns() {
var columns =[]
//columns push reimbursementApplierGrid的字段
columns.push({display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},);
columns.push({display: "研发项目", name: "zzyl01", width: 150, minwidth: 80, type: "string", align: "left",});
columns.push({display: "研发项目", name: "zzyl01", width: 200, minwidth: 80, type: "string", align: "left",
editor: {
required: false, type: "text",
}
});
columns.push({display: "", name: "reimbursementDetailId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},);
columns.push({display: "", name: "reimbursementBaseInfoId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},);
columns.push({display: "", name: "mwskz", width: 80, minwidth: 80, type: "string", align: "left", hide: true},);
......@@ -474,7 +478,13 @@ function loadGrid(obj) {
}
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.id = null;
newRow.reimbursementDetailId = null;
newRow.zepPdamount1 = null;
newRow.zepPdtax1 = null;
newRow.zepPtdamount1 = null;
newRow.zepPdamount = null;
newRow.zepPdtax = null;
newRow.zepPtdamount = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
View file @ a99e33f4
......@@ -142,7 +142,7 @@ var tableArray = [
if (item.waers === "CNY"){
money=item.kzwi1;
}else {
money=MathUtil.mul(item.kzwi1,item.kursf);
money=MathUtil.mul(item.kzwi1,item.kursf).toFixed(2);
}
return item.kzwi11 = money;
}
......@@ -362,6 +362,8 @@ function loadGrid(obj) {
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
newRow.zepPtdamount1 = null;
newRow.zepPtdamount = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js
View file @ a99e33f4
......@@ -18,11 +18,11 @@ function loadGrid() {
}
},
exportExcelHandler: exportExcelHandler,
// backHandler: {
// id: 'backHandler', text: '退料', img:'fa-edit', click: function(){
// backHandler();
// }
// },
backHandler: {
id: 'backHandler', text: '退料', img:'fa-edit', click: function(){
backHandler();
}
},
});
gridManager = UICtrl.grid("#maingrid", {
columns: [
......@@ -38,12 +38,12 @@ function loadGrid() {
{display: "物料描述", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",},
{display: "库存地点", name: "lgobe", width: 200, minWidth: 60, type: "string", align: "left",},
{display: "数量", name: "erfmg", width: 100, minWidth: 60, type: "string", align: "left",},
// {display: "申请退料数量", name: "backNum", width: 100, minWidth: 60, type: "string", align: "left",},
// {display: "实际退料数量", name: "zerfmg", width: 100, minWidth: 60, type: "string", align: "left",},
// {display: "申请退料原因", name: "backReason", width: 150, minWidth: 60, type: "string", align: "left",},
// {display: "申请退料时间", name: "backDate", width: 150, minWidth: 60, type: "string", align: "left",},
// {display: "退料凭证", name: "chargeOffMessage", width: 150, minWidth: 60, type: "string", align: "left",},
// {display: "是否完结", name: "checkedBox", width: 100, minWidth: 60, type: "string", align: "left",},
{display: "申请退料数量", name: "backNum", width: 100, minWidth: 60, type: "string", align: "left",},
{display: "实际退料数量", name: "zerfmg", width: 100, minWidth: 60, type: "string", align: "left",},
{display: "申请退料原因", name: "backReason", width: 150, minWidth: 60, type: "string", align: "left",},
{display: "申请退料时间", name: "backDate", width: 150, minWidth: 60, type: "string", align: "left",},
{display: "退料凭证", name: "chargeOffMessage", width: 150, minWidth: 60, type: "string", align: "left",},
{display: "是否完结", name: "checkedBox", width: 100, minWidth: 60, type: "string", align: "left",},
{display: "计量单位", name: "msehl", width: 90, minWidth: 60, type: "string", align: "left",},
{display: "领料方", name: "wempf", width: 200, minWidth: 60, type: "string", align: "left",},
{display: "备注用途", name: "usedTextView", width: 200, minWidth: 60, type: "string", align: "left",},
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.jsp
View file @ a99e33f4
......@@ -75,9 +75,9 @@
<x:inputC name="strSuppl4" label="街道5" labelCol="1" fieldCol="2" maxLength="35"/>
<x:selectC name="langu" label="语言" labelCol="1" fieldCol="2" required="true" dictionary="langu"/>
<x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2" maxLength="30"/>
<x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2" maxLength="30" match="email"/>
<x:inputC name="postCode1" label="城市邮政编码" labelCol="1" fieldCol="2" required="true" maxLength="6"/>
<x:inputC name="telNumber" label="电话" labelCol="1" fieldCol="2"/>
<x:inputC name="telNumber" label="电话" labelCol="1" fieldCol="2" match="phone"/>
<%--<x:inputC name="telExtens" label="第一个电话号码分机" labelCol="1" fieldCol="2"/>--%>
<x:inputC name="mobNumber" label="移动电话" labelCol="1" fieldCol="2"/>
<%--<x:inputC name="mobExtens" label="第一个移动电话号码分机" labelCol="1" fieldCol="2"/>--%>
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersExtendDataDetail.jsp
View file @ a99e33f4
......@@ -67,9 +67,9 @@
<x:inputC name="strSuppl4" label="街道5" labelCol="1" fieldCol="2" maxLength="35" readonly="true"/>
<x:selectC name="langu" label="语言" labelCol="1" fieldCol="2" required="true" dictionary="langu" disabled="true"/>
<x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2" maxLength="30" readonly="true"/>
<x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2" maxLength="30" readonly="true" match="email"/>
<x:inputC name="postCode1" label="城市邮政编码" labelCol="1" fieldCol="2" required="true" maxLength="6" readonly="true"/>
<x:inputC name="telNumber" label="电话" labelCol="1" fieldCol="2" readonly="true"/>
<x:inputC name="telNumber" label="电话" labelCol="1" fieldCol="2" readonly="true" match="phone"/>
<%--<x:inputC name="telExtens" label="第一个电话号码分机" labelCol="1" fieldCol="2"/>--%>
<x:inputC name="mobNumber" label="移动电话" labelCol="1" fieldCol="2" readonly="true"/>
<%--<x:inputC name="mobExtens" label="第一个移动电话号码分机" labelCol="1" fieldCol="2"/>--%>
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ a99e33f4
......@@ -372,7 +372,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
.append(",")
.append(applyDept.getSingleThickness());
sapVO.setBomText(bomText.toString());
//sapVO.setZpostbs("X");
sapVO.setZpostbs("X");//BPM标识
List<ProdApplyToSapVO> mapList = new ArrayList<>();
mapList.add(sapVO);
//日志记录
......
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/impl/NonProducePickApplicationImpl.java
View file @ a99e33f4
......@@ -170,10 +170,6 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
pdaNonProducePickItemVo.setUsed(used);
return pdaNonProducePickItemVo;
}).collect(Collectors.toList());
// String jsonString = "";
// if (ObjectUtil.isNotEmpty(itemVoList)){
// jsonString = JSONArray.toJSONString(itemVoList);
// }
return itemVoList;
}
......@@ -193,20 +189,22 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
if (StringUtil.isBlank(pickItem.getChargeOffMessage())){
pickItem.setChargeOffMessage(item.getChargeOffMessage());
}else {
pickItem.setChargeOffMessage(pickItem.getChargeOffMessage()+","+item.getChargeOffMessage());
if (!pickItem.getChargeOffMessage().contains(item.getChargeOffMessage())){
pickItem.setChargeOffMessage(pickItem.getChargeOffMessage()+","+item.getChargeOffMessage());
}
}
//如果实际退料数量是空直接赋值，如果有值，进行累加
if (pickItem.getBackNum() == null){
pickItem.setBackNum(item.getZerfmg());
if (pickItem.getZerfmg() == null){
pickItem.setZerfmg(item.getZerfmg());
}else {
BigDecimal backNum = pickItem.getBackNum();
BigDecimal zerfmg1 = pickItem.getZerfmg();
BigDecimal zerfmg = item.getZerfmg();
pickItem.setBackNum(backNum.add(zerfmg));
pickItem.setZerfmg(zerfmg1.add(zerfmg));
}
if (StringUtil.isBlank(item.getCheckedBox())){
BigDecimal zerfmg = item.getZerfmg();
BigDecimal backNum = pickItem.getBackNum();
//实际退料数量大于等于退料数量标识完结Y，否则N
BigDecimal zerfmg = pickItem.getZerfmg();
BigDecimal backNum = pickItem.getBackNum();
if (zerfmg.compareTo(backNum) > 0){
pickItem.setCheckedBox("Y");
}else {
......
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/vo/PDANonProducePickItemVo.java
View file @ a99e33f4
......@@ -98,4 +98,21 @@ public class PDANonProducePickItemVo implements Serializable {
*/
@JsonProperty("BACK_DATE")
private String backDate;
/**
* 实际退料数量
*/
@JsonProperty("ZERFMG")
private BigDecimal zerfmg;
public BigDecimal getZerfmg() {
return zerfmg;
}
public void setZerfmg(BigDecimal zerfmg) {
if (zerfmg == null) {
zerfmg = BigDecimal.ZERO;
}
this.zerfmg = zerfmg;
}
}
topsun/src/main/resources/config/topsun/sap/nonProducePick/nonProducePick.xml
View file @ a99e33f4
......@@ -76,6 +76,7 @@
t.erfmg,
t.meins,
t.wempf,
t.zerfmg,
t.used,
d.`NAME` AS ztext,
DATE_FORMAT(t.back_date, '%Y-%m-%d %H:%i:%s') as back_date,
......@@ -83,7 +84,7 @@
FROM sap_non_produce_pick_item t
LEFT JOIN sap_non_produce_pick p ON p.id = t.non_produce_pick_id
LEFT JOIN sa_dictionarydetail D ON t.used = d.`VALUE`
WHERE t.back_num IS NOT NULL and t.checked_box != 'Y'
WHERE t.back_num IS NOT NULL and (t.checked_box != 'Y' or t.checked_box is null or t.checked_box = '')
</sql-query>
<condition column="message" name="message" type="java.lang.String" symbol="in" alias="p"/>
</query>
......
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