Commit 0998a3ce authored by wanghang's avatar wanghang

Merge remote-tracking branch 'origin/dev' into dev

parents cb05b927 9297255f
var gridManager = null;
$(document).ready(function () {
loadAcceptanceFormAckGrid();
searchAreaToggle();
});
// function initializateUI() {
// UICtrl.layout("#layout", {leftWidth: 3});
// }
function loadAcceptanceFormAckGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
updateHandler: function () {
},
});
gridManager = UICtrl.grid("#acceptanceFormAckGrid", {
columns: [
{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"},
{display: "销售订单行", name: "vgpos", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "物料编号", name: "matnr", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "物料名称", name: "maktx", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "交货单号", name: "vbeln", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "交货单项", name: "posnr", width: 120, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/sapAcceptanceForm/findAcceptanceForm.ajax',
enabledEdit: true,
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
width: "100%",
height: "100%",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow: function (data, rowindex, rowobj) {
// updateHandler(data);
}
});
UICtrl.setSearchAreaToggle(gridManager, true);
}
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 = $('#queryMainForm').formToJSON({ check: true });
if(!process) { return; }
// $('#taskBar').find('div.ui-grid-query-div').find('input').val('');
var params = $('#queryMainForm').formToJSON();
if(!compareForDate(params.zmkt4, params.zmkt4_end)) {
$('#zmkt4').val('').onFocus();
$('#zmkt4_end').val('')
return;
}
if(!compareForDate(params.lfdat, params.lfdat_end)) {
$('#lfdat').val('').onFocus();
$('#lfdat_end').val('')
return;
}
// params.singleProcInstShowOneTask = $("#singleProcInstShowOneTask").is(":checked");
UICtrl.gridSearch(gridManager, params);
}
/**
* 展开搜索框
*/
function searchAreaToggle() {
setTimeout(function() {
$('a.togglebtn').click();
}, 500);
}
//日期大小比较
function compareForDate(start,end){
start=start.replace(/-/g,'').replace(/ /g,'').replace(/:/g,'');
end=end.replace(/-/g,'').replace(/ /g,'').replace(/:/g,'');
start=parseInt(start,10);
end=parseInt(end,10);
if(isNaN(start)||isNaN(end)){
return true;
}
if(start>end){
Public.tip('开始时间不能大于结束时间!');
return false;
}
return true;
}
function resetForm(obj) {
$(obj).formClean();
}
// if(!$("#kunag").val()){
// Public.tip("请选择输入客户编码!");
// return;
// }
\ No newline at end of file
<%--
Created by IntelliJ IDEA.
User: qinzhenguan
Date: 2024/1/22
Time: 15:33
To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=utf-8"%>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html>
<head>
<title>Title</title>
<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">
<div class="hg-form-row">
<x:inputC name="vbeln" required="false" label="交货单-VBELN" labelCol="1" fieldCol="2"/>
<x:inputC name="bstnk" required="false" label="客户单号-BSTNK" labelCol="1" fieldCol="2"/>
<x:inputC name="zinstnum" required="false" label="指令号-ZINSTNUM" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="kunag" required="true" label="客户编码-KUNAG" labelCol="1" fieldCol="2"/>
<x:inputC name="vkorg" required="false" label="销售组织-VKORG" labelCol="1" fieldCol="2"/>
<div class="col-xs-12 col-sm-3 col-warp checkBoxDiv">
<div><x:checkbox name="zacsmk" label="仅显示未标记"/></div>
</div>
</div>
<div class="hg-form-row">
<x:inputC name="zacrc" required="false" label="客户验收要求-ZACRC" labelCol="1" fieldCol="2"/>
<x:inputC name="zmkt4" required="false" label="业务标记日期起" labelCol="1" fieldCol="2" wrapper="date"/>
<x:inputC name="zmkt4_end" required="false" label="业务标记日期止" labelCol="1" fieldCol="2" wrapper="date"/>
</div>
<div class="hg-form-row">
<x:inputC name="zcors" required="false" label="做账状态-ZCORS" labelCol="1" fieldCol="2"/>
<x:inputC name="lfdat" required="false" label="交货单日期起" labelCol="1" fieldCol="2" wrapper="date"/>
<x:inputC name="lfdat_end" required="false" label="交货单日期止" labelCol="1" fieldCol="2" wrapper="date"/>
</div>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
<div title="验收单标记">
<div id="acceptanceFormAckGrid" style="margin: 2px;"></div>
</div>
</div>
</body>
</html>
var workCenterGridManager = null;
$(document).ready(function() { $(document).ready(function() {
loadSapWorkCenterGrid(); loadSapWorkCenterGrid();
}); });
...@@ -11,7 +13,7 @@ function loadSapWorkCenterGrid() { ...@@ -11,7 +13,7 @@ function loadSapWorkCenterGrid() {
updateHandler(); updateHandler();
} }
}); });
gridManager = UICtrl.grid("#sapWorkCenterGrid", { workCenterGridManager = UICtrl.grid("#sapWorkCenterGrid", {
columns: [ columns: [
{ display: "填写说明", name: "productName", width: 140, minWidth: 60, type: "string", align: "left"}, { display: "填写说明", name: "productName", width: 140, minWidth: 60, type: "string", align: "left"},
{ display: "维护标识", name: "productCategoryId", width: 120, minWidth: 60, type: "string", align: "left" }, { display: "维护标识", name: "productCategoryId", width: 120, minWidth: 60, type: "string", align: "left" },
...@@ -47,26 +49,27 @@ function loadSapWorkCenterGrid() { ...@@ -47,26 +49,27 @@ function loadSapWorkCenterGrid() {
updateHandler(data); updateHandler(data);
} }
}); });
UICtrl.setSearchAreaToggle(gridManager); UICtrl.setSearchAreaToggle(workCenterGridManager);
} }
function updateHandler(data) { function updateHandler(data) {
let id = data.id; if (!data) {
if (!id) { data = DataUtil.getSelectedRow(workCenterGridManager);
id = DataUtil.getUpdateRowId(gridManager); }
if (!id) { if (!data) {
return; Public.tip('请勾选需要修改的数据!');
} return;
} }
// 更新标识: I 插入; U 修改; D 删除 // 更新标识: I 插入; U 修改; D 删除
data.updkz = 'U'; 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}); UICtrl.addTabItem({tabid: 'workCenterEdit' + new Date().getTime(), text: "AAAA", url: url});
} }
function addHandler(data) { function addHandler() {
let data = {};
// 更新标识: I 插入; U 修改; D 删除 // 更新标识: I 插入; U 修改; D 删除
data.updkz = 'I'; 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}); UICtrl.addTabItem({tabid: 'workCenterAdd' + new Date().getTime(), text: "AAAA", url: url});
} }
\ No newline at end of file
package com.huigou.topsun.sap.acceptanceFormAck.application;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.huigou.topsun.sap.acceptanceFormAck.domain.SapAcceptanceFormAck;
import com.huigou.util.SDO;
import java.util.ArrayList;
import java.util.Map;
/**
@author YourUserName
*/
public interface SapAcceptanceFormAckApplication {
ArrayList<Map<String, Object>> findAcceptanceForm(SDO sdo);
String queryAcceptanceForms(SapAcceptanceFormAck acceptanceForm) throws JsonProcessingException;
String ackAcceptanceForm(SDO sdo);
}
package com.huigou.topsun.sap.acceptanceFormAck.application.impl;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.topsun.sap.acceptanceFormAck.domain.SapAcceptanceFormAck;
import com.huigou.topsun.sap.acceptanceFormAck.application.SapAcceptanceFormAckApplication;
import com.huigou.topsun.util.TestClientHttp;
import com.huigou.util.SDO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
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;
/**
@author YourUserName
*/
@Service
@RequiredArgsConstructor
public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAckApplication {
private final ObjectMapper objectMapper;
@PersistenceContext(unitName = "system")
private EntityManager entityManager;
@Override
public ArrayList<Map<String, Object>> findAcceptanceForm(SDO sdo) {
String execute;
Map<String, Object> param = sdo.getProperties();
List<SapAcceptanceFormAck> acceptanceForms = null;
try {
execute = TestClientHttp.execute(param, "http://127.0.0.1:8080/topsun_xt_war/sapAcceptanceForm/queryAcceptanceForm.ajax");
String resultStr = JSONObject.parseObject(execute).get("data").toString();
acceptanceForms = objectMapper.readValue(resultStr, new TypeReference<List<SapAcceptanceFormAck>>() {});
} catch (JsonProcessingException e) {
e.printStackTrace();
return null;
} catch (RuntimeException | IOException e ) {
throw new RuntimeException(e);
}
return objectMapper.convertValue(acceptanceForms, new TypeReference<ArrayList<Map<String, Object>>>() {
});
}
@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 查询条件
* @return java.lang.String
* @author qinzhenguan
* @createDate 2024/1/23 11:50
*/
@Override
public String queryAcceptanceForms(SapAcceptanceFormAck acceptanceForm) throws JsonProcessingException {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
CriteriaQuery<SapAcceptanceFormAck> query = criteriaBuilder.createQuery(SapAcceptanceFormAck.class);
Root<SapAcceptanceFormAck> root = query.from(SapAcceptanceFormAck.class);
List<Predicate> predicates = new ArrayList<>();
// ====================== 设置查询条件 ======================
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()));
}
}
}
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;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.annotation.SkipAuth;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import javax.servlet.http.HttpServletRequest;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
/**
* SapAcceptanceFormAck 验收单标记控制类
*
* @author qinzhenguan
* @createDate 2024/01/22 16:05
**/
@RequiredArgsConstructor
@Controller
@ControllerMapping("/sapAcceptanceForm")
public class SapAcceptanceFormAckController extends CommonController {
private final SapAcceptanceFormAckApplication ackServer;
@Override
protected String getPagePath() {
return "/biz/topsun/sap/acceptanceFormAck/";
}
public String forwardAcceptanceForm() {
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() {
SDO sdo = this.getSDO();
ArrayList<Map<String, Object>> list = ackServer.findAcceptanceForm(sdo);
HashMap<Object, Object> map = new HashMap<>(3);
map.put("Rows", list);
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();
SapAcceptanceFormAck acceptanceForm;
try (InputStream ist = request.getInputStream();
InputStreamReader istr = new InputStreamReader(ist, StandardCharsets.UTF_8);) {
String requestBody = new BufferedReader(istr).lines().collect(Collectors.joining("\n"));
ObjectMapper objectMapper = new ObjectMapper();
acceptanceForm = objectMapper.readValue(requestBody, SapAcceptanceFormAck.class);
} catch (IOException e) {
throw new RuntimeException(e);
}
String acceptanceForms = ackServer.queryAcceptanceForms(acceptanceForm);
return success(acceptanceForms);
}
}
\ No newline at end of file
package com.huigou.topsun.sap.acceptanceFormAck.domain;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Objects;
import javax.persistence.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.huigou.topsun.common.NumberToStringSerializer;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
/**
* @author YourUserName
* null
*/
@JsonInclude(JsonInclude.Include.ALWAYS)
@JsonIgnoreProperties(ignoreUnknown = true)
@Entity
@Table(name = "sap_acceptance_form_ack")
public class SapAcceptanceFormAck implements Serializable {
/**
* null
*/
@Id
@Column(name = "uuid", nullable = false, length = 32)
private String uuid;
/**
* 交货单
*/
@Column(name = "vbeln", nullable = true, length = 32)
private String vbeln;
/**
* 客户单号
*/
@Column(name = "bstnk", nullable = true, length = 32)
private String bstnk;
/**
* 指令号
*/
@Column(name = "zinstnum", nullable = true, length = 32)
private String zinstnum;
/**
* 客户(售达方)
*/
@Column(name = "kunag", nullable = true, length = 120)
private String kunag;
/**
* 销售组织: 1000: 广州宝绅科技销售组织; 2000: 广州市金库物联销售组织
*/
@Column(name = "vkorg", nullable = true, length = 10)
private String vkorg;
/**
* 业务标记日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "zsckdt", nullable = true)
private java.util.Date zsckdt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "zsckdt_end", nullable = true)
private java.util.Date zsckdtEnd;
/**
* 交货单日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "lfdat", nullable = true)
private java.util.Date lfdat;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "lfdat_end", nullable = true)
private java.util.Date lfdatEnd;
/**
* 做账状态(未定): Y: 已做账; N: 未做账
*/
@Column(name = "zcors", nullable = true, length = 3)
private String zcors;
/**
* 客户验收单要求: Y: 要求; N: 不要求
*/
@Column(name = "zacrc", nullable = true, length = 3)
private String zacrc;
/**
* 验收单业务标记
*/
@Column(name = "zacsmk", nullable = true, length = 3)
private String zacsmk;
/**
* 验收单财务标记
*/
@Column(name = "zacfmk", nullable = true, length = 3)
private String zacfmk;
/**
* 销售订单
*/
@Column(name = "VGBEL", nullable = true, length = 255)
private String vgbel;
/**
* 销售订单行
*/
@Column(name = "VGPOS", nullable = true, length = 255)
private String vgpos;
/**
* 物料编号
*/
@Column(name = "MATNR", nullable = true, length = 255)
private String matnr;
/**
* 物料名称
*/
@Column(name = "MAKTX", nullable = true, length = 255)
private String maktx;
/**
* 交货单项
*/
@Column(name = "POSNR", nullable = true, length = 255)
private String posnr;
/**
* 名称 1
*/
@Column(name = "NAME1", nullable = true, length = 255)
private String name1;
/**
* 客户验收单要求
*/
@Column(name = "KATR6", nullable = true, length = 255)
private String katr6;
/**
* 跟单员
*/
@Column(name = "ZHDLR", nullable = true, length = 255)
private String zhdlr;
/**
* 跟单员名字
*/
@Column(name = "ZHDNM", nullable = true, length = 255)
private String zhdnm;
/**
* 验收单业务标记人
*/
@Column(name = "ZMKP4", nullable = true, length = 255)
private String zmkp4;
/**
* 验收单业务标记日期
*/
@Column(name = "ZMKT4", nullable = true, length = 255)
private String zmkt4;
/**
* 客户物料编码
*/
@Column(name = "KDMAT", nullable = true, length = 255)
private String kdmat;
/**
* 客户物料名称
*/
@Column(name = "POSTX", nullable = true, length = 255)
private String postx;
@Override
public boolean equals(Object o) {
if (this == o) { return true; }
if (o == null || getClass() != o.getClass()) { return false; }
SapAcceptanceFormAck that = (SapAcceptanceFormAck) o;
return Objects.equals(uuid, that.uuid) && Objects.equals(vbeln, that.vbeln) && Objects.equals(bstnk, that.bstnk) && Objects.equals(zinstnum, that.zinstnum) && Objects.equals(kunag, that.kunag) && Objects.equals(vkorg, that.vkorg) && Objects.equals(zsckdt, that.zsckdt) && Objects.equals(zsckdtEnd, that.zsckdtEnd) && Objects.equals(lfdat, that.lfdat) && Objects.equals(lfdatEnd, that.lfdatEnd) && Objects.equals(zcors, that.zcors) && Objects.equals(zacrc, that.zacrc) && Objects.equals(zacsmk, that.zacsmk) && Objects.equals(zacfmk, that.zacfmk) && Objects.equals(vgbel, that.vgbel) && Objects.equals(vgpos, that.vgpos) && Objects.equals(matnr, that.matnr) && Objects.equals(maktx, that.maktx) && Objects.equals(posnr, that.posnr) && Objects.equals(name1, that.name1) && Objects.equals(katr6, that.katr6) && Objects.equals(zhdlr, that.zhdlr) && Objects.equals(zhdnm, that.zhdnm) && Objects.equals(zmkp4, that.zmkp4) && Objects.equals(zmkt4, that.zmkt4) && Objects.equals(kdmat, that.kdmat) && Objects.equals(postx, that.postx);
}
@Override
public int hashCode() {
return Objects.hash(uuid, vbeln, bstnk, zinstnum, kunag, vkorg, zsckdt, zsckdtEnd, lfdat, lfdatEnd, zcors, zacrc, zacsmk, zacfmk, vgbel, vgpos, matnr, maktx, posnr, name1, katr6, zhdlr, zhdnm, zmkp4, zmkt4, kdmat, postx);
}
public Date getZsckdtEnd() {
return zsckdtEnd;
}
public void setZsckdtEnd(Date zsckdtEnd) {
this.zsckdtEnd = zsckdtEnd;
}
public Date getLfdatEnd() {
return lfdatEnd;
}
public void setLfdatEnd(Date lfdatEnd) {
this.lfdatEnd = lfdatEnd;
}
public String getUuid() {
return this.uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
public String getVbeln() {
return this.vbeln;
}
public void setVbeln(String vbeln) {
this.vbeln = vbeln;
}
public String getBstnk() {
return this.bstnk;
}
public void setBstnk(String bstnk) {
this.bstnk = bstnk;
}
public String getZinstnum() {
return this.zinstnum;
}
public void setZinstnum(String zinstnum) {
this.zinstnum = zinstnum;
}
public String getKunag() {
return this.kunag;
}
public void setKunag(String kunag) {
this.kunag = kunag;
}
public String getVkorg() {
return this.vkorg;
}
public void setVkorg(String vkorg) {
this.vkorg = vkorg;
}
public java.util.Date getZsckdt() {
return this.zsckdt;
}
public void setZsckdt(java.util.Date zsckdt) {
this.zsckdt = zsckdt;
}
public java.util.Date getLfdat() {
return this.lfdat;
}
public void setLfdat(java.util.Date lfdat) {
this.lfdat = lfdat;
}
public String getZcors() {
return this.zcors;
}
public void setZcors(String zcors) {
this.zcors = zcors;
}
public String getZacrc() {
return this.zacrc;
}
public void setZacrc(String zacrc) {
this.zacrc = zacrc;
}
public String getZacsmk() {
return this.zacsmk;
}
public void setZacsmk(String zacsmk) {
this.zacsmk = zacsmk;
}
public String getZacfmk() {
return this.zacfmk;
}
public void setZacfmk(String zacfmk) {
this.zacfmk = zacfmk;
}
public String getVgbel() {
return this.vgbel;
}
public void setVgbel(String vgbel) {
this.vgbel = vgbel;
}
public String getVgpos() {
return this.vgpos;
}
public void setVgpos(String vgpos) {
this.vgpos = vgpos;
}
public String getMatnr() {
return this.matnr;
}
public void setMatnr(String matnr) {
this.matnr = matnr;
}
public String getMaktx() {
return this.maktx;
}
public void setMaktx(String maktx) {
this.maktx = maktx;
}
public String getPosnr() {
return this.posnr;
}
public void setPosnr(String posnr) {
this.posnr = posnr;
}
public String getName1() {
return this.name1;
}
public void setName1(String name1) {
this.name1 = name1;
}
public String getKatr6() {
return this.katr6;
}
public void setKatr6(String katr6) {
this.katr6 = katr6;
}
public String getZhdlr() {
return this.zhdlr;
}
public void setZhdlr(String zhdlr) {
this.zhdlr = zhdlr;
}
public String getZhdnm() {
return this.zhdnm;
}
public void setZhdnm(String zhdnm) {
this.zhdnm = zhdnm;
}
public String getZmkp4() {
return this.zmkp4;
}
public void setZmkp4(String zmkp4) {
this.zmkp4 = zmkp4;
}
public String getZmkt4() {
return this.zmkt4;
}
public void setZmkt4(String zmkt4) {
this.zmkt4 = zmkt4;
}
public String getKdmat() {
return this.kdmat;
}
public void setKdmat(String kdmat) {
this.kdmat = kdmat;
}
public String getPostx() {
return this.postx;
}
public void setPostx(String postx) {
this.postx = postx;
}
}
package com.huigou.topsun.sap.acceptanceFormAck.repository;
import com.huigou.topsun.sap.acceptanceFormAck.domain.SapAcceptanceFormAck;
import org.springframework.data.jpa.repository.JpaRepository;
/**
@author YourUserName
*/
public interface SapAcceptanceFormAckRepository extends JpaRepository<SapAcceptanceFormAck, String> {
}
...@@ -44,7 +44,7 @@ public class SapWorkCenterLogController extends CommonController { ...@@ -44,7 +44,7 @@ public class SapWorkCenterLogController extends CommonController {
return "/biz/topsun/sap/workCenter/"; return "/biz/topsun/sap/workCenter/";
} }
public String goWorkCenter() { public String forwardWorkCenter() {
return forward("sapWorkCenter"); return forward("sapWorkCenter");
} }
...@@ -55,7 +55,7 @@ public class SapWorkCenterLogController extends CommonController { ...@@ -55,7 +55,7 @@ public class SapWorkCenterLogController extends CommonController {
return toResult(map); return toResult(map);
} }
public String goWorkCenterDetail() { public String forwardWorkCenterDetail() {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
return forward("sapWorkCenterDetail"); return forward("sapWorkCenterDetail");
} }
......
...@@ -31,7 +31,7 @@ public class TestClientHttp { ...@@ -31,7 +31,7 @@ public class TestClientHttp {
try { try {
SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
requestFactory.setConnectTimeout(5000); requestFactory.setConnectTimeout(5000);
requestFactory.setReadTimeout(5000); requestFactory.setReadTimeout(50000);
URI uri = URI.create(url); URI uri = URI.create(url);
HttpMethod method = HttpMethod.POST; HttpMethod method = HttpMethod.POST;
......
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