Skip to content

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

采购申请、订单审批显示长文本；物料类型是：半成品、原材料、产成品蔡设置分类类型、分类名称；付款申请无PO增加研发项目字段

parent c79589aa
Show whitespace changes
Inline Side-by-side
Showing with 101 additions and 16 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @ aeb401b7
......@@ -35,31 +35,31 @@ var tableArray = [
align: "left",
},
{
display: "BP标识", name: "zepBptype", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP标识", name: "zepBptype", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP标识描述", name: "zepBptypename", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP标识描述", name: "zepBptypename", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP账号名称", name: "koinh", width: 200, minwidth: 120, type: "string", align: "left",
display: "BP账号名称", name: "koinh", width: 200, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "采购发票号", name: "belnr2", width: 120, minwidth: 120, type: "string", align: "left",
},
{
display: "采购发票行", name: "buzei", width: 120, minwidth: 120, type: "string", align: "left"
display: "采购发票行", name: "buzei", width: 120, minwidth: 120, type: "string", align: "left",
},
// {
// display: "采购发票行信息", name: "zrsegItem", width: 300, minwidth: 120, type: "string", align: "left",
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
View file @ aeb401b7
......@@ -6,6 +6,11 @@ var tableArray = [
data: null,
columns: [
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{display: "研发项目", name: "zzyl01", width: 150, minwidth: 80, type: "string", align: "left",
editor: {
required: false, type: "text",
}
},
{display: "", name: "reimbursementDetailId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "", name: "reimbursementBaseInfoId", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "", name: "mwskz", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
View file @ aeb401b7
......@@ -18,8 +18,8 @@ function initializate() {
// UICtrl.setDisable("#businessUsageDiv")
UICtrl.setDisable("#totalContentDiv");
coRowNum= $("#busiLens").val();
$("#klart").val("023")
$("#classify").val("Z_YCL")
//$("#klart").val("023")
//$("#classify").val("Z_YCL")
//页面控制
UICtrl.enable($("#businessUsage"));
UICtrl.enable($("#matklName"));
......@@ -41,7 +41,7 @@ function initializate() {
//分类类型、分类名称
$("#klart").val("023");
$("#classify").val("Z_PROD");
}else if (data.value == "ZFBL" || data.value == "ZMYP" || data.value == "ZYCL"){
}else if (data.value == "ZYCL"){
$("#xchpf").val("X");
//分类类型、分类名称
$("#klart").val("023");
......@@ -979,6 +979,9 @@ function bindEvent_warehouse(mtart){
if (mtart == "ZGMB"){
$("#sernp").val("Z005");
$("#serlv").val("1");
}else {
$("#sernp").val("");
$("#serlv").val("");
}
//过账到质检
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
View file @ aeb401b7
......@@ -27,8 +27,8 @@
<x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>
<%--<x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>--%>
<x:selectC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType"/>
<x:inputC name="startDate" label="开始日期" wrapper="date" labelCol="1" />
<x:inputC name="endDate" label="结束日期" wrapper="date" labelCol="1" />
<x:inputC name="startDate" label="开始日期" wrapper="datetime" labelCol="1" />
<x:inputC name="endDate" label="结束日期" wrapper="datetime" labelCol="1" />
<div class="hg-form-row">
<x:checkboxListC name="status" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ aeb401b7
......@@ -164,7 +164,7 @@ function initKlart(mtart) {
//分类类型、分类名称
$("#klart").val("023");
$("#classify").val("Z_PROD");
}else if (mtart == "ZFBL" || mtart == "ZMYP" || mtart == "ZYCL"){
}else if (mtart == "ZYCL"){
//分类类型、分类名称
$("#klart").val("023");
$("#classify").val("Z_YCL");
......
topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.js
View file @ aeb401b7
......@@ -138,6 +138,8 @@ function loadGrid() {
if (item.column.name == "belongings" ){
if (item.value.indexOf("空车") > -1 ){
$("#isEmptyCar").val("Y");
}else {
$("#isEmptyCar").val("0");
}
}
return item;
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.js
View file @ aeb401b7
......@@ -70,6 +70,7 @@ function getGridColumns() {
{display: "工厂名称", name: "name1", width: "200", align: "left", type: "string"},
{display: "物料编号", name: "matnr", width: "200", align: "left", type: "string",},
{display: "物料描述", name: "txz01", width: "300", align: "left", type: "string",},
{display: "文本", name: "maktxRemZh", width: "300", align: "left", type: "string",},
{display: "物料组", name: "matkl", width: "100", align: "left", type: "string",},
{display: "物料组描述", name: "wgbez", width: "100", align: "left", type: "string",},
{display: "采购申请数量", name: "menge", width: 150, minWidth: 60, type: "string", align: "center",},
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js
View file @ aeb401b7
......@@ -48,6 +48,7 @@ function getGridColumns() {
{display: "科目分配类别描述", name: "knttx", width: "100", align: "left", type: "string"},
{display: "物料号", name: "matnr", width: "200", align: "left", type: "string"},
{display: "物料描述", name: "txz01", width: "300", align: "left", type: "string"},
{display: "文本", name: "maktxRemZh", width: "300", align: "left", type: "string",},
{display: "物料组", name: "matkl", width: "100", align: "left", type: "string"},
{display: "物料组描述", name: "wgbez", width: "100", align: "left", type: "string"},
{display: "采购订单数量", name: "menge", width: "100", align: "left", type: "string"},
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java
View file @ aeb401b7
......@@ -264,6 +264,11 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
Map<String, Object> map = MyBaseUtil.convertToMap(sapCostReimbursement, true);
map.remove("ZEP_FTYPE");
map.remove("ZEP_NO");
map.remove("PARTNER");
map.remove("BANKN");
map.remove("KOINH");
map.remove("BANKL");
map.remove("SWIFT");
if (sapCostReimbursement.getZepFcrdate() != null){
String dateFormat = DateUtil.getDateFormat(sapCostReimbursement.getZepFcrdate(), "yyyyMMdd");
map.put("ZEP_FCRDATE",dateFormat);
......@@ -273,6 +278,7 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
for (SapCostReimbursementDetail costReimbursementDetail : all) {
Map<String, Object> detailMap = MyBaseUtil.convertToMap(costReimbursementDetail, true);
detailMap.remove("ZPAY_STAUS");
if (costReimbursementDetail.getZepFpldate() != null){
String dateFormat = DateUtil.getDateFormat(costReimbursementDetail.getZepFpldate(), "yyyyMMdd");
detailMap.put("ZEP_FPLDATE",dateFormat);
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/SapCostReimbursement.java
View file @ aeb401b7
......@@ -262,6 +262,12 @@ public class SapCostReimbursement extends FlowBillAbstractEntity {
@Column(name = "BANKL")
private String bankl;
/**
* SWIFT/BIC
*/
@Column(name = "SWIFT")
private String swift;
@Override
protected String getCodeRuleId() {
return "sapCostReimbursement";
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/SapCostReimbursementDetail.java
View file @ aeb401b7
......@@ -448,4 +448,10 @@ public class SapCostReimbursementDetail implements Serializable {
@Column(name = "kbetr")
private BigDecimal kbetr;
/**
* 研发项目
*/
@Column(name = "ZZYL01")
private String zzyl01;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyApplication.java
View file @ aeb401b7
......@@ -37,4 +37,6 @@ public interface NonProdApplyApplication{
String saveProdApplyFromSapVO(ProdApplyFromSapVO prodApplyFromSapVO);
Map<String, Object> slicedNonApplyBaseInfoByMaktx(NonProdApplyBaseInfoQueryRequest query);
String getMaktxRemZhByMatnrAndWerks(String matnr,String werks);
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ aeb401b7
......@@ -33,6 +33,7 @@ import com.huigou.topsun.sap.nonProdApply.domain.vo.ProdApplyFromSapVO;
import com.huigou.topsun.sap.nonProdApply.domain.vo.ProdApplyToSapVO;
import com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyBaseInfoRepository;
import com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyDeptRepository;
import com.huigou.topsun.sap.wasteSale.domain.WasteSale;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bmp.operator.OperatorApplication;
......@@ -60,6 +61,7 @@ import javax.annotation.Resource;
import javax.persistence.Column;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@Service("nonProdApplyApplication")
public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdApplyApplication {
......@@ -82,6 +84,8 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
private OrgRepository orgRepository;
@Autowired
DefaultHttpClient defaultHttpClient;
@Autowired
private NonProdApplyDeptRepository nonProdApplyDeptRepository;
@SneakyThrows
@Transactional(propagation = Propagation.REQUIRES_NEW)
......@@ -434,6 +438,30 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
return this.sqlExecutorDao.executeSlicedQuery(model);
}
@Override
public String getMaktxRemZhByMatnrAndWerks(String matnr, String werks) {
String maktxRemZh = "";
if (StringUtil.isNotBlank(matnr) && StringUtil.isNotBlank(werks)){
List<SapNonProdApplyDept> deptList = nonProdApplyDeptRepository.findByMatnrAndWerks(matnr, werks);
if (deptList.size()>0){
List<String> ids = deptList
.stream()
.map(SapNonProdApplyDept::getBaseInfoId)
.collect(Collectors.toList());
List<NonProdApplyBaseInfo> list = nonProdApplyBaseInfoRepository.findAll(ids);
list = list
.stream()
.filter( nonProdApplyBaseInfo -> nonProdApplyBaseInfo.getDistribute() == 2 && StringUtil.isNotBlank(nonProdApplyBaseInfo.getMaktxRemZh()))
.sorted(Comparator.comparing(NonProdApplyBaseInfo::getFillinDate).reversed())
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(list)){
maktxRemZh = list.get(0).getMaktxRemZh();
}
}
}
return maktxRemZh;
}
@Override
//获取变更或扩展前的业务部门
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ aeb401b7
......@@ -373,7 +373,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
.append(",")
.append(applyDept.getSingleThickness());
sapVO.setBomText(bomText.toString());
//sapVO.setZpostbs("X");
List<ProdApplyToSapVO> mapList = new ArrayList<>();
mapList.add(sapVO);
//日志记录
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyToSapVO.java
View file @ aeb401b7
......@@ -828,4 +828,8 @@ public class ProdApplyToSapVO {
@JsonProperty("UEETK")
private String ueetk;
//传输标识默认"X"
@JsonProperty("ZPOSTBS")
private String zpostbs;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/repository/NonProdApplyDeptRepository.java
View file @ aeb401b7
......@@ -12,6 +12,7 @@ public interface NonProdApplyDeptRepository extends JpaRepository<SapNonProdAppl
SapNonProdApplyDept findByBaseInfoId(String baseInfoId);
SapNonProdApplyDept findByApplyDeptId(String applyDeptId);
SapNonProdApplyDept findByMatnr(String matnr);
List<SapNonProdApplyDept> findByMatnrAndWerks(String matnr,String werks);
List <SapNonProdApplyDept> findByMaktx(String maktx);
}
topsun/src/main/java/com/huigou/topsun/sap/permit/application/impl/SapPermitApplicationImpl.java
View file @ aeb401b7
......@@ -224,7 +224,7 @@ public class SapPermitApplicationImpl extends FlowBroker implements SapPermitApp
//初始化用户信息
Operator operator = operatorApplication.createOperatorByPersonMemberId(sapPermitVo.getApplyPerson());
sapPermit.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
sapPermit.setIsEmptyCar("0");//设置不是空车
Map<String, Object> formData = BeanUtil.beanToMap(sapPermit);
//保存明细
List<SapPermitItemVo> itemVos = sapPermitVo.getItemVos();
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalItemApplicationImpl.java
View file @ aeb401b7
......@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.purchaseApproval.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
import com.huigou.topsun.sap.purchaseApproval.application.SapPurchaseApprovalItemApplication;
import com.huigou.topsun.sap.purchaseApproval.domain.SapPurchaseApprovalItem;
import com.huigou.topsun.sap.purchaseApproval.domain.query.SapPurchaseApprovalItemQueryRequest;
......@@ -24,6 +25,8 @@ import java.util.Map;
public class SapPurchaseApprovalItemApplicationImpl extends BaseApplication implements SapPurchaseApprovalItemApplication {
@Resource
private SapPurchaseApprovalItemRepository sapPurchaseApprovalItemRepository;
@Resource
private NonProdApplyApplication nonProdApplyApplication;
@Override
public void saveSapPurchaseApprovalItems(String sapPurchaseApprovalId, List<SapPurchaseApprovalItem> sapPurchaseApprovalItems) {
sapPurchaseApprovalItems.forEach(sapPurchaseApprovalItem -> {
......@@ -46,6 +49,13 @@ public class SapPurchaseApprovalItemApplicationImpl extends BaseApplication impl
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapPurchaseApprovalItems");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("Rows");
mapList.forEach(m->{
String matnr = (String)m.get("matnr");
String werks = (String)m.get("werks");
String maktxRemZh = nonProdApplyApplication.getMaktxRemZhByMatnrAndWerks(matnr, werks);
m.put("maktxRemZh", maktxRemZh);
});
}
return map;
}
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderItemApplicationImpl.java
View file @ aeb401b7
......@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.purchaseOrder.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderItemApplication;
import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrderItem;
import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderItemQueryRequest;
......@@ -24,6 +25,8 @@ import java.util.Map;
public class SapPurchaseOrderItemApplicationImpl extends BaseApplication implements SapPurchaseOrderItemApplication {
@Resource
private SapPurchaseOrderItemRepository sapPurchaseOrderItemRepository;
@Resource
private NonProdApplyApplication nonProdApplyApplication;
@Override
public void saveSapPurchaseOrderItem(SapPurchaseOrderItem sapPurchaseOrderItem) {
sapPurchaseOrderItemRepository.save(sapPurchaseOrderItem);
......@@ -49,6 +52,13 @@ public class SapPurchaseOrderItemApplicationImpl extends BaseApplication impleme
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapPurchaseOrderItems");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("Rows");
mapList.forEach(m->{
String matnr = (String)m.get("matnr");
String werks = (String)m.get("werks");
String maktxRemZh = nonProdApplyApplication.getMaktxRemZhByMatnrAndWerks(matnr, werks);
m.put("maktxRemZh", maktxRemZh);
});
}
return map;
}
......
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