Skip to content

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

客供料通知跟单员，跟单员关单后，待办消息消失；退料时申请一次，PDA上多次提交数据的时候，返回值，BPM数量可以新加，凭证分别显示;完结之后，查询接口不传到... 

客供料通知跟单员，跟单员关单后，待办消息消失；退料时申请一次，PDA上多次提交数据的时候，返回值，BPM数量可以新加，凭证分别显示;完结之后，查询接口不传到PDA，就不会有退料；供应商增加付款条件得查询条件；付款申请根据供应商带出结算方式
parent cea1a775
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 33 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/clientMaterials/clientMaterialsList.js
View file @ b752d5d8
......@@ -12,8 +12,8 @@ function initUI() {
function loadGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
// exportExcelHandler:exportExcelHandler,
deleteHandler:{id:'deleteHandler',img:'fa-cloud-delete',text:'完成订单',click:deleteHandler},
deleteHandler:{id:'deleteHandler',img:'fa-cloud-delete',text:'完成订单',click:deleteHandler},
exportExcelHandler:exportExcelHandler,
});
gridManager = UICtrl.grid("#maingrid", {
......@@ -28,6 +28,7 @@ function loadGrid() {
{display: "计划订单", name: "plnum", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "销售订单", name: "kdauf", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "行项次", name: "kdpos", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "跟单员", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "生产订单", name: "aufnr", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "是否完成", name: "closedTextView", width: 100, minWidth: 60, type: "string", align: "left"},
],
......@@ -74,6 +75,12 @@ function deleteHandler(){
});
}
//导出Excel
function exportExcelHandler() {
var date = Public.formatDate(new Date(),`%Y%M%D`);
UICtrl.gridExport(gridManager,{fileName:"客供料通知"+date});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @ b752d5d8
......@@ -535,10 +535,6 @@ function loadGrid(obj) {
})
UICtrl.setGridColumns(obj.gridManager,columns);
}
if (item.column.name == "partner" ){
var text1 = item.record.text1;
$("#text1").val(text1);
}
return item;
},
onAfterShowData:function (){
......@@ -653,6 +649,7 @@ function bindQueryEvent() {
onChange: function (value, data) {
$('#partner').val(data.PARTNER);
$('#koinh').val(data.NAME_ORG1);
$("#text1").val(data.TEXT1);
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.jsp
View file @ b752d5d8
......@@ -55,7 +55,7 @@
<div class="hg-form-row">
<x:inputC name="zepFtamount" required="false" readonly="true" label="申请总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="zepFtamount1" required="false" readonly="true" label="申请总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="text1" required="false" readonly="true" label="月结方式" labelCol="2" fieldCol="2"/>
<x:inputC name="text1" required="false" readonly="true" label="结算方式" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="partner" required="true" label="BP(合作伙伴)" labelCol="2" fieldCol="2" wrapper="select"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js
View file @ b752d5d8
......@@ -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,8 +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: "backReason", width: 150, 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/suppliersDataList.js
View file @ b752d5d8
......@@ -42,17 +42,7 @@ function loadSuppliersDataListGrid() {
{display: "申请单编号", name: "billCode", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "操作类型", name: "applyTypeTextView", width: 80, minWidth: 60, type: "string", align: "left"
// ,render : function (record, rowindex, value, column) {
// if (value!=null&&value=="0") {
// return "新增";
// }else if (value!=null&&value=="1"){
// return "修改";
// } else if (){
// return "删除";
// }
// }
},
{display: "操作类型", name: "applyTypeTextView", width: 80, minWidth: 60, type: "string", align: "left"},
{display: "业务伙伴分组", name: "buGroupTextView", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "业务伙伴编号", name: "partner", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "组织名称1", name: "nameOrg1", width: 200, minWidth: 60, type: "string", align: "left"},
......@@ -61,7 +51,7 @@ function loadSuppliersDataListGrid() {
{display: "组织名称4", name: "nameOrg4", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "业务伙伴的搜索词1", name: "buSort1", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "业务伙伴的搜索词2", name: "buSort2", width: 140, minWidth: 60, type: "string", align: "left"},
// {display: "通用品名", name: "genericName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "付款条件", name: "payConditionTextView", width: 140, minWidth: 60, type: "string", align: "left"},
// {display: "适用标准", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
//{display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "国家", name: "land1Name", width: 140, minWidth: 60, type: "string", align: "left"},
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataList.jsp
View file @ b752d5d8
......@@ -23,6 +23,7 @@
<x:inputC name="nameOrg1" required="false" label="组织名称1" labelCol="1"/>
<x:selectC name="applyType" label="操作类型" labelCol="1" fieldCol="2" dictionary="applyType"/>
<x:selectC name="buGroup" label="业务伙伴分组" labelCol="1" fieldCol="2" dictionary="buGroup"/>
<x:selectC name="payCondition" label="付款条件" labelCol="1" fieldCol="2" dictionary="payCondition"/>
<x:inputC name="personMemberName" label="申请人" labelCol="1" fieldCol="2"/>
<x:inputC name="fillinBeginDate" label="申请日期起" labelCol="1" fieldCol="2" wrapper="dateTime"/>
<x:inputC name="fillinEndDate" label="申请日期止" labelCol="1" fieldCol="2" wrapper="dateTime"/>
......
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/BsnMessageApplication.java
View file @ b752d5d8
......@@ -99,4 +99,5 @@ public interface BsnMessageApplication {
*/
List<BsnMessageReject> getRejectDetail(String meId);
void deleteByBusinessId(String businessId);
}
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/impl/BsnMessageApplicationImpl.java
View file @ b752d5d8
......@@ -290,6 +290,19 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
return messageRejectRepository.findAllByBsnExecuteId(meId, sort);
}
@Override
public void deleteByBusinessId(String businessId) {
BsnMessageSponsor sponsor = messageSponsorRepository.findByBusinessId(businessId);
sponsor.setStatus(2);
List<BsnMessageExecute> allByMessageSponsorId = messageExecuteRepository.findAllByMessageSponsorId(sponsor.getId());
for (BsnMessageExecute execute:allByMessageSponsorId) {
execute.setActive(ActiveStatus.FINISHED.getValue());
execute.setFinishedDate(new Date());
messageExecuteRepository.save(execute);
}
this.messageSponsorRepository.save(sponsor);
}
public BsnMessageSponsor getSponsorByBId(String bId) {
BsnMessageSponsor sponsor = messageSponsorRepository.findByBusinessId(bId);
......
topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/application/impl/ClientMaterialsApplicationImpl.java
View file @ b752d5d8
......@@ -116,8 +116,9 @@ public class ClientMaterialsApplicationImpl extends BaseApplication implements C
for (ClientMaterialsVo clientMaterialsVo : sapClientMaterialsList) {
//ClientMaterials clientMaterialsDb = clientMaterialsRepository.findByPlnum(clientMaterialsVo.getPlnum());
List<ClientMaterials> clientMaterialsDbs = clientMaterialsRepository.findByPlnumAndKdaufAndKdpos(clientMaterialsVo.getPlnum(),clientMaterialsVo.getKdauf(),clientMaterialsVo.getKdpos());
if (CollectionUtils.isEmpty(clientMaterialsDbs)){
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryPersonByRole");
List<Map<String, Object>> personMaps = this.sqlExecutorDao.queryToListMap(queryDescriptor.getSql(), null);
ClientMaterials clientMaterialsDb = new ClientMaterials();
BeanUtil.copyProperties(clientMaterialsVo,clientMaterialsDb);
//根据跟单员初始化创建人信息
......@@ -135,10 +136,12 @@ public class ClientMaterialsApplicationImpl extends BaseApplication implements C
clientMaterialsDb.setPersonMemberName(org.getName());
clientMaterialsDb.setFullId(org.getFullId());
}
Map<String, Object> map = new HashMap<>();
map.put("id",org.getPerson().getId());
personMaps.add(map);
}
clientMaterialsRepository.save(clientMaterialsDb);
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryPersonByRole");
List<Map<String, Object>> personMaps = this.sqlExecutorDao.queryToListMap(queryDescriptor.getSql(), null);
//推送待办任务
this.pushTask(clientMaterialsDb,personMaps);
}else {
......@@ -190,6 +193,7 @@ public class ClientMaterialsApplicationImpl extends BaseApplication implements C
//删除成功，保存数据
clientMaterials.setClosed("1");
clientMaterialsRepository.save(clientMaterials);
bsnMessageApplication.deleteByBusinessId(clientMaterials.getId());
}
} catch (IOException e) {
throw new RuntimeException(e);
......
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/impl/NonProducePickApplicationImpl.java
View file @ b752d5d8
......@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -187,7 +188,33 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
List<NonProducePickItem> itemList = nonProducePickItemApplication.findByNonProducePickId(producePick.getId());
itemList.forEach(pickItem -> {
if (pickItem.getRspos().equals(item.getRspos())){
pickItem.setChargeOffMessage(item.getChargeOffMessage());
//如果冲销凭证号是空直接赋值，如果有值，以逗号拼接
if (StringUtil.isBlank(pickItem.getChargeOffMessage())){
pickItem.setChargeOffMessage(item.getChargeOffMessage());
}else {
pickItem.setChargeOffMessage(pickItem.getChargeOffMessage()+","+item.getChargeOffMessage());
}
//如果实际退料数量是空直接赋值，如果有值，进行累加
if (pickItem.getBackNum() == null){
pickItem.setBackNum(item.getZerfmg());
}else {
BigDecimal backNum = pickItem.getBackNum();
BigDecimal zerfmg = item.getZerfmg();
pickItem.setBackNum(backNum.add(zerfmg));
}
if (StringUtil.isBlank(item.getCheckedBox())){
BigDecimal zerfmg = item.getZerfmg();
BigDecimal backNum = pickItem.getBackNum();
//实际退料数量大于等于退料数量标识完结Y，否则N
if (zerfmg.compareTo(backNum) > 0){
pickItem.setCheckedBox("Y");
}else {
pickItem.setCheckedBox("N");
}
}else {
pickItem.setCheckedBox(item.getCheckedBox());
}
nonProducePickItemApplication.updateNonProducePickItem(pickItem);
}
});
......
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/impl/NonProducePickItemApplicationImpl.java
View file @ b752d5d8
......@@ -11,6 +11,7 @@ import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -62,6 +63,7 @@ public class NonProducePickItemApplicationImpl extends BaseApplication implement
@Override
public void updateNonProducePickItem(NonProducePickItem nonProducePickItem) {
nonProducePickItem.setBackDate(new Date());
nonProducePickItemRepository.save(nonProducePickItem);
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/NonProducePickItem.java
View file @ b752d5d8
......@@ -7,6 +7,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Auther: xin.lu
......@@ -104,5 +105,22 @@ public class NonProducePickItem extends AbstractEntity {
@Column(name = "charge_off_message")
private String chargeOffMessage;
/**
*退料时间
*/
@Column(name = "back_date")
private Date backDate;
/**
* 实际退料数量
*/
@Column(name = "zerfmg")
private BigDecimal zerfmg;
/**
* 完结状态 'Y'，'N
*/
@Column(name = "checked_box")
private String checkedBox;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/vo/PDABackPickItemVo.java
View file @ b752d5d8
......@@ -5,6 +5,7 @@ import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @author xin.lu
......@@ -30,4 +31,17 @@ public class PDABackPickItemVo implements Serializable {
*/
@JsonProperty("RSNUM2")
private String chargeOffMessage;
/**
* 实际退料数量
*/
@JsonProperty("ZERFMG")
private BigDecimal zerfmg;
/**
* 是否结案
*/
@JsonProperty("CHECKED_BOX")
private String checkedBox;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/vo/PDANonProducePickItemVo.java
View file @ b752d5d8
......@@ -6,6 +6,7 @@ import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Auther: xin.lu
......@@ -80,9 +81,21 @@ public class PDANonProducePickItemVo implements Serializable {
@JsonProperty("ZYTBM")
private String used;
/**
* 用途描述
*/
@JsonProperty("ZTEXT")
private String ztext;
/**
*退料数量
*/
@JsonProperty("BACK_NUM")
private BigDecimal backNum;
/**
*退料时间
*/
@JsonProperty("BACK_DATE")
private String backDate;
}
topsun/src/main/java/com/huigou/topsun/sap/suppliers/domain/query/SuppliersDataQueryRequest.java
View file @ b752d5d8
......@@ -48,4 +48,6 @@ public class SuppliersDataQueryRequest extends QueryAbstractRequest {
protected Date fillinBeginDate;
protected Date fillinEndDate;
private String payCondition;
}
topsun/src/main/resources/config/topsun/sap/nonProducePick/nonProducePick.xml
View file @ b752d5d8
......@@ -37,6 +37,10 @@
pi.used,
pi.back_num,
pi.back_reason,
pi.back_date,
pi.zerfmg,
pi.checked_box,
pi.charge_off_message,
pi.remark
FROM sap_non_produce_pick t
LEFT JOIN sap_non_produce_pick_item pi ON t.id = pi.non_produce_pick_id where 1=1
......@@ -73,10 +77,13 @@
t.meins,
t.wempf,
t.used,
d.`NAME` AS ztext,
DATE_FORMAT(t.back_date, '%Y-%m-%d %H:%i:%s') as back_date,
t.back_num
FROM sap_non_produce_pick_item t
LEFT JOIN sap_non_produce_pick p ON p.id = t.non_produce_pick_id
WHERE t.back_num IS NOT NULL
LEFT JOIN sa_dictionarydetail D ON t.used = d.`VALUE`
WHERE t.back_num IS NOT NULL and t.checked_box != 'Y'
</sql-query>
<condition column="message" name="message" type="java.lang.String" symbol="in" alias="p"/>
</query>
......
topsun/src/main/resources/config/topsun/sap/sapSuppliersData/suppliersData.xml
View file @ b752d5d8
......@@ -2,8 +2,7 @@
<query-mappings>
<query name="slicedSuppliersInfoQuery" table="sap_suppliers_info">
<sql-query>
select t.* from sap_suppliers_info t
where 1=1
select t.*,b.pay_condition from sap_suppliers_info t left join sap_suppliers_buyer b on b.s_id = t.id where 1=1
</sql-query>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="name_Org1" name="nameOrg1" type="java.lang.String" symbol="like" alias="t"/>
......@@ -12,6 +11,7 @@
<condition column="apply_type" name="applyType" type="java.lang.String" symbol="=" alias="t"/>
<condition column="bu_group" name="buGroup" type="java.lang.String" symbol="=" alias="t"/>
<condition column="person_member_name" name="personMemberName" type="java.lang.String" symbol="=" alias="t"/>
<condition column="pay_condition" name="payCondition" type="java.lang.String" symbol="=" alias="b"/>
<condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
<condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
</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