Skip to content

T
topsun-bpm
Commit 6684d04b authored by 覃振观's avatar 覃振观 👶
Browse files
Options

验收单标记(未测试)需要更改 

1、TestClientHttp => HttpClient
2、acceptanceFormAckGrid 完善显示字段
3、查询与提交时，测试代码数据类型与接口返回不一致的
4、测试完成后，需要把进入页面默认加载数据 变更为 点击查询之后才查询数据
parent dd382026
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 21 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/acceptanceFormAck/acceptanceFormAck.js
View file @ 6684d04b
......@@ -12,18 +12,16 @@ $(document).ready(function () {
function loadAcceptanceFormAckGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
updateHandler: function () {
updateHandler();
},
});
gridManager = UICtrl.grid("#acceptanceFormAckGrid", {
columns: [
{display: "验收单业务标记", name: "zacsmk", width: 120, minWidth: 60, type: "string", align: "left",
editor: {
type: "combobox",
valueField: "UID",
displayField: "Name",
multiSelect: true,
showCheckIcon: true
{display: "验收单业务标记", name: "zacsmk", width: 120, minWidth: 60, type: "string", align: "center",
render: function(item) {
if(item.zacsmk === "1") {
return "<a href='#' class='GridStyle' onclick=\"sampling('" + encodeURIComponent(JSON.stringify(item)) + "')\">取消</a>";
}
return "<a href='#' class='GridStyle' onclick=\"sampling('" + encodeURIComponent(JSON.stringify(item)) + "')\">标记</a>";
}},
{display: "验收单财务标记", name: "zacfmk", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "销售订单", name: "vgbel", width: 140, minWidth: 60, type: "string", align: "left"},
......@@ -35,6 +33,7 @@ function loadAcceptanceFormAckGrid() {
],
dataAction: "server",
url: web_app.name + '/sapAcceptanceForm/findAcceptanceForm.ajax',
enabledEdit: true,
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
......@@ -45,19 +44,39 @@ function loadAcceptanceFormAckGrid() {
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow: function (data, rowindex, rowobj) {
updateHandler(data);
// updateHandler(data);
}
});
UICtrl.setSearchAreaToggle(gridManager);
}
function query(obj) {
function sampling (str) {
let rowData = JSON.parse(decodeURIComponent(str));
let loginCode = document.getElementById('loginCode').value;
let zacsmk = !(rowData.zacsmk*1);
let zmkt4 = new Date().getTime();
let params = {
"vbeln": rowData.vbeln,
"posnr": rowData.posnr,
"zacsmk": zacsmk,
"zmkp4": loginCode,
"zmkt4": zmkt4
}
Public.ajax(web_app.name + "/sapAcceptanceForm/ackAcceptanceForm.ajax", params,
function (data) {
query();
});
}
function query() {
let process = $(obj).formToJSON({ check: true });
let process = $('#queryMainForm').formToJSON({ check: true });
if(!process) { return; }
// $('#taskBar').find('div.ui-grid-query-div').find('input').val('');
var params = $(obj).formToJSON();
var params = $('#queryMainForm').formToJSON();
if(!compareForDate(params.zmkt4, params.zmkt4_end)) {
$('#zmkt4').val('').onFocus();
$('#zmkt4_end').val('')
......
topsun-xt/src/main/webapp/biz/topsun/sap/acceptanceFormAck/acceptanceFormAck.jsp
View file @ 6684d04b
......@@ -11,13 +11,14 @@
<html>
<head>
<title>Title</title>
<x:base include="layout,dialog,grid,tree,combox,date" />
<x:base include="layout,dialog,grid,tree,combox,date,checkbox" />
<x:script src='/system/opm/js/OpmUtil.js'/>
<x:script src='/biz/topsun/sap/acceptanceFormAck/acceptanceFormAck.js'/>
</head>
<body>
<div class="container-fluid">
<x:hidden name="loginCode"/>
<x:title title="搜索" hideTable="queryMainForm" isHide="false" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
......
topsun-xt/src/main/webapp/biz/topsun/sap/workCenter/sapWorkCenter.js
View file @ 6684d04b
......@@ -60,13 +60,13 @@ function updateHandler(data) {
}
// 更新标识: I 插入； U 修改； D 删除
data.updkz = 'U';
let url = DataUtil.composeURLByParam('/sapWorkCenter/goWorkCenterDetail.do', data);
let url = DataUtil.composeURLByParam('/sapWorkCenter/forwardWorkCenterDetail.do', data);
UICtrl.addTabItem({tabid: 'workCenterEdit' + new Date().getTime(), text: "AAAA", url: url});
}
function addHandler(data) {
// 更新标识: I 插入； U 修改； D 删除
data.updkz = 'I';
let url = DataUtil.composeURLByParam('/sapWorkCenter/goWorkCenterDetail.do', data);
let url = DataUtil.composeURLByParam('/sapWorkCenter/forwardWorkCenterDetail.do', data);
UICtrl.addTabItem({tabid: 'workCenterAdd' + new Date().getTime(), text: "AAAA", url: url});
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/acceptanceFormAck/application/SapAcceptanceFormAckApplication.java
View file @ 6684d04b
......@@ -16,4 +16,6 @@ public interface SapAcceptanceFormAckApplication {
ArrayList<Map<String, Object>> findAcceptanceForm(SDO sdo);
String queryAcceptanceForms(SapAcceptanceFormAck acceptanceForm) throws JsonProcessingException;
String ackAcceptanceForm(SDO sdo);
}
topsun/src/main/java/com/huigou/topsun/sap/acceptanceFormAck/application/impl/SapAcceptanceFormAckApplicationImpl.java
View file @ 6684d04b
......@@ -19,6 +19,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -53,6 +54,20 @@ public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAc
});
}
@Override
public String ackAcceptanceForm(SDO sdo) {
String execute;
HashMap<String, Object> param = new HashMap<>(22);
param.put("data", sdo.getProperties());
try {
execute = TestClientHttp.execute(param,
"http://127.0.0.1:8080/topsun_xt_war/sapAcceptanceForm/saveAcceptanceForm.ajax");
} catch (Exception e) {
throw new RuntimeException(e);
}
return execute;
}
/**
* @description 模拟 SAP 接口 (临时)
* @param acceptanceForm 查询条件
......@@ -68,12 +83,32 @@ public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAc
Root<SapAcceptanceFormAck> root = query.from(SapAcceptanceFormAck.class);
List<Predicate> predicates = new ArrayList<>();
if(acceptanceForm.getVbeln() != null && !acceptanceForm.getVbeln().isEmpty()) {
predicates.add(criteriaBuilder.equal(root.get("vbeln"), acceptanceForm.getVbeln()));
}
// ====================== 设置查询条件 ======================
settingCriteriaAck(acceptanceForm, predicates, criteriaBuilder, root);
query.where(criteriaBuilder.and(predicates.toArray(new Predicate[0])));
List<SapAcceptanceFormAck> results = entityManager.createQuery(query).getResultList();
return results.size() > 0 ? objectMapper.writeValueAsString(results) : "";
}
/***
* @description 设置查询条件
* @author qinzhenguan
* @createDate 2024/1/24 8:22
*/
public void settingCriteriaAck(SapAcceptanceFormAck acceptanceForm, List<Predicate> predicates,
CriteriaBuilder criteriaBuilder, Root<SapAcceptanceFormAck> root) {
if(acceptanceForm.getKunag() != null && !acceptanceForm.getKunag().isEmpty()) {
predicates.add(criteriaBuilder.equal(root.get("kunag"), acceptanceForm.getKunag()));
}
if(acceptanceForm.getVkorg() != null && !acceptanceForm.getVkorg().isEmpty()) {
predicates.add(criteriaBuilder.equal(root.get("vkorg"), acceptanceForm.getVkorg()));
}
if(acceptanceForm.getLfdat() != null) {
predicates.add(criteriaBuilder.equal(root.get("lfdat"), acceptanceForm.getLfdat()));
}
}
}
topsun/src/main/java/com/huigou/topsun/sap/acceptanceFormAck/controller/SapAcceptanceFormAckController.java
View file @ 6684d04b
......@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.acceptanceFormAck.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.context.Operator;
import com.huigou.topsun.sap.acceptanceFormAck.application.SapAcceptanceFormAckApplication;
import com.huigou.topsun.sap.acceptanceFormAck.domain.SapAcceptanceFormAck;
import com.huigou.topsun.sap.workcenter.domain.SapWorkCenter;
......@@ -42,7 +43,12 @@ public class SapAcceptanceFormAckController extends CommonController {
}
public String forwardAcceptanceForm() {
return forward("acceptanceFormAck");
SDO sdo = this.getSDO();
Operator operator = sdo.getOperator();
String loginCode = operator.getLoginUser().getLoginName();
HashMap<String, Object> param = new HashMap<>(3);
param.put("loginCode", loginCode);
return forward("acceptanceFormAck", param);
}
public String findAcceptanceForm() {
......@@ -53,6 +59,27 @@ public class SapAcceptanceFormAckController extends CommonController {
return toResult(map);
}
public String ackAcceptanceForm() {
SDO sdo = this.getSDO();
String msg = ackServer.ackAcceptanceForm(sdo);
return success();
}
@SkipAuth
public String saveAcceptanceForm() {
HttpServletRequest request = this.getRequest();
String requestBody = "";
try (InputStream ist = request.getInputStream();
InputStreamReader istr = new InputStreamReader(ist, StandardCharsets.UTF_8);) {
requestBody = new BufferedReader(istr).lines().collect(Collectors.joining("\n"));
} catch (IOException e) {
throw new RuntimeException(e);
}
System.out.println("save requestBody : "+ requestBody);
return success();
}
@SkipAuth
public String queryAcceptanceForm() throws JsonProcessingException {
HttpServletRequest request = this.getRequest();
......
topsun/src/main/java/com/huigou/topsun/sap/workcenter/controller/SapWorkCenterLogController.java
View file @ 6684d04b
......@@ -44,7 +44,7 @@ public class SapWorkCenterLogController extends CommonController {
return "/biz/topsun/sap/workCenter/";
}
public String goWorkCenter() {
public String forwardWorkCenter() {
return forward("sapWorkCenter");
}
......@@ -55,7 +55,7 @@ public class SapWorkCenterLogController extends CommonController {
return toResult(map);
}
public String goWorkCenterDetail() {
public String forwardWorkCenterDetail() {
SDO sdo = this.getSDO();
return forward("sapWorkCenterDetail");
}
......
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