Skip to content

T
topsun-bpm
Commit a502bde8 authored by wanghang's avatar wanghang
Browse files
Options

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

parents 44424c15 c0173fc9
Hide whitespace changes
Inline Side-by-side
Showing with 489 additions and 230 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/acceptanceFormAck/acceptanceFormAck.js
View file @ a502bde8
...@@ -16,20 +16,50 @@ function loadAcceptanceFormAckGrid() { ...@@ -16,20 +16,50 @@ function loadAcceptanceFormAckGrid() {
}); });
gridManager = UICtrl.grid("#acceptanceFormAckGrid", { gridManager = UICtrl.grid("#acceptanceFormAckGrid", {
columns: [ columns: [
{display: "验收单业务标记", name: "zacsmk", width: 120, minWidth: 60, type: "string", align: "center", {display: "验收单业务标记", name: "zcsamk", width: 120, minWidth: 60, type: "string", align: "center",
render: function(item) { render: function(item) {
if(item.zacsmk === "1") { if(item.zacsmk === "x") {
return "<a href='#' class='GridStyle' onclick=\"sampling('" + encodeURIComponent(JSON.stringify(item)) + "')\">取消</a>"; return "<a href='#' class='GridStyle' onclick=\"sampling('" + encodeURIComponent(JSON.stringify(item)) + "')\">取消</a>";
} }
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: "vgbel", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "销售凭证项目", name: "vgpos", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "销售订单行", name: "vgpos", width: 140, minWidth: 60, type: "string", align: "left"}, {display: "物料编号", name: "matnr", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "物料编号", name: "matnr", width: 100, minWidth: 60, type: "string", align: "left"}, {display: "物料描述", name: "maktx", 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: "vbeln", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "销售和分销凭证的项目号", name: "posnr", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "交货单项", name: "posnr", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "销售组织", name: "vkorg", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "售达方", name: "kunag", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "名称", name: "vkorg", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "请款联", name: "katr6", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "交货日期", name: "lfdat", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "客户编号", name: "zhdlr", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "客户名称", name: "zhdnm", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "验收单标记人", name: "zmkp4", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "验收单标记时间", name: "zmkt4", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "验收单业务标记", name: "vkorg", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "销售组织", name: "zacsmk", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "验收单业务标记人", name: "zmkp5", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "验收单业务标记时间", name: "zmkt5", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "客户物料", name: "kdmat", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "参考的描述", name: "postx", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "客户参考", name: "bstkd", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "指令号", name: "zinsn", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "型体号", name: "zmold", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "配色号", name: "zmapcolor", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "段别", name: "zsegm", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "实际已交货量（按销售单位）", name: "lfimg", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "以销售单位表示的累计订购数量", name: "kwmeng", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "请款数量", name: "zcorqt", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "销售单位", name: "vrkme", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "净价", name: "netpr", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "SD 凭证货币", name: "waerk", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "备注", name: "zcnote", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "请款单号", name: "zcrnr", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "请款单项次", name: "zcritm", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "做账人", name: "zcrrsp", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "做账时间", name: "zctime", width: 120, minWidth: 60, type: "string", align: "left"}
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/sapAcceptanceForm/findAcceptanceForm.ajax', url: web_app.name + '/sapAcceptanceForm/findAcceptanceForm.ajax',
...@@ -71,11 +101,8 @@ function sampling (str) { ...@@ -71,11 +101,8 @@ function sampling (str) {
} }
function query() { function query() {
let process = $('#queryMainForm').formToJSON({ check: true }); let process = $('#queryMainForm').formToJSON({ check: true });
if(!process) { return; } if(!process) { return; }
// $('#taskBar').find('div.ui-grid-query-div').find('input').val('');
var params = $('#queryMainForm').formToJSON(); var params = $('#queryMainForm').formToJSON();
if(!compareForDate(params.zmkt4, params.zmkt4_end)) { if(!compareForDate(params.zmkt4, params.zmkt4_end)) {
$('#zmkt4').val('').onFocus(); $('#zmkt4').val('').onFocus();
...@@ -87,9 +114,23 @@ function query() { ...@@ -87,9 +114,23 @@ function query() {
$('#lfdat_end').val('') $('#lfdat_end').val('')
return; return;
} }
params.zaicsm = params.zaicsm === undefined ? '' : !(params.zaicsm*1) ? '' : 'X';
params.zacfmk = params.zacfmk === undefined ? '' : !(params.zacfmk*1) ? '' : 'X';
setCriteria(params);
// params.singleProcInstShowOneTask = $("#singleProcInstShowOneTask").is(":checked"); // params.singleProcInstShowOneTask = $("#singleProcInstShowOneTask").is(":checked");
UICtrl.gridSearch(gridManager, params); UICtrl.gridSearch(gridManager, params);
} }
function setCriteria(params) {
params.zacfmk='X';
params.vkorg='1000';
params.kunag='0000600005';
params.vbeln_low='0080000002';
params.vbeln_high='0080000005';
params.zsckdt_low='20240101';
params.zsckdt_high='20240510';
params.lfdat_low='20240101';
params.lfdat_high='20240510';
}
/** /**
* 展开搜索框 * 展开搜索框
...@@ -102,16 +143,18 @@ function searchAreaToggle() { ...@@ -102,16 +143,18 @@ function searchAreaToggle() {
//日期大小比较 //日期大小比较
function compareForDate(start,end){ function compareForDate(start,end){
start=start.replace(/-/g,'').replace(/ /g,'').replace(/:/g,''); if(start && end) {
end=end.replace(/-/g,'').replace(/ /g,'').replace(/:/g,''); start = start.replace(/-/g,'').replace(/ /g,'').replace(/:/g,'');
start=parseInt(start,10); end=end.replace(/-/g,'').replace(/ /g,'').replace(/:/g,'');
end=parseInt(end,10); start = parseInt(start,10);
if(isNaN(start)||isNaN(end)){ end=parseInt(end,10);
return true; if(isNaN(start)||isNaN(end)){
} return true;
if(start>end){ }
Public.tip('开始时间不能大于结束时间!'); if(start>end){
return false; Public.tip('开始时间不能大于结束时间!');
return false;
}
} }
return true; return true;
} }
...@@ -120,7 +163,3 @@ function resetForm(obj) { ...@@ -120,7 +163,3 @@ function resetForm(obj) {
$(obj).formClean(); $(obj).formClean();
} }
// if(!$("#kunag").val()){
// Public.tip("请选择输入客户编码！");
// return;
// }
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/acceptanceFormAck/acceptanceFormAck.jsp
View file @ a502bde8
...@@ -22,30 +22,42 @@ ...@@ -22,30 +22,42 @@
<x:title title="搜索" hideTable="queryMainForm" isHide="false" /> <x:title title="搜索" hideTable="queryMainForm" isHide="false" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm"> <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="vbeln" required="false" label="交货单-VBELN" labelCol="1" fieldCol="2"/> <x:inputC name="kunag" required="true" label="售达方" labelCol="1" fieldCol="2"/>
<x:inputC name="bstnk" required="false" label="客户单号-BSTNK" labelCol="1" fieldCol="2"/> <x:inputC name="vkorg" required="false" label="销售组织" labelCol="1" fieldCol="2"/>
<x:inputC name="zinstnum" required="false" label="指令号-ZINSTNUM" labelCol="1" fieldCol="2"/> <x:inputC name="zcors" required="false" label="做账状态-ZCORS" labelCol="1" fieldCol="2"/>
<x:inputC name="zacrc" required="false" label="客户验收要求" labelCol="1" fieldCol="2"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="kunag" required="true" label="客户编码-KUNAG" labelCol="1" fieldCol="2"/> <x:inputC name="vbeln_low" required="false" label="交货单号开始" labelCol="1" fieldCol="2"/>
<x:inputC name="vkorg" required="false" label="销售组织-VKORG" labelCol="1" fieldCol="2"/> <x:inputC name="vbeln_high" required="false" label="交货单号结束" labelCol="1" fieldCol="2"/>
<div class="col-xs-12 col-sm-3 col-warp checkBoxDiv"> <x:inputC name="bstnk_low" required="false" label="客户单号开始" labelCol="1" fieldCol="2"/>
<div><x:checkbox name="zacsmk" label="仅显示未标记"/></div> <x:inputC name="bstnk_high" required="false" label="客户单号结束" labelCol="1" fieldCol="2"/>
</div>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="zacrc" required="false" label="客户验收要求-ZACRC" labelCol="1" fieldCol="2"/> <x:inputC name="zsckdt_low" required="false" label="业务标记日期起" labelCol="1" fieldCol="2" wrapper="date"/>
<x:inputC name="zmkt4" required="false" label="业务标记日期起" labelCol="1" fieldCol="2" wrapper="date"/> <x:inputC name="zsckdt_high" required="false" label="业务标记日期止" labelCol="1" fieldCol="2" wrapper="date"/>
<x:inputC name="zmkt4_end" required="false" label="业务标记日期止" labelCol="1" fieldCol="2" wrapper="date"/> <x:inputC name="lfdat_low" required="false" label="交货单日期起" labelCol="1" fieldCol="2" wrapper="date"/>
<x:inputC name="lfdat_high" required="false" label="交货单日期止" labelCol="1" fieldCol="2" wrapper="date"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="zcors" required="false" label="做账状态-ZCORS" labelCol="1" fieldCol="2"/> <x:inputC name="zinstnum_low" required="false" label="指令号开始" labelCol="1" fieldCol="2"/>
<x:inputC name="lfdat" required="false" label="交货单日期起" labelCol="1" fieldCol="2" wrapper="date"/> <x:inputC name="zinstnum_high" required="false" label="指令号结束" labelCol="1" fieldCol="2"/>
<x:inputC name="lfdat_end" required="false" label="交货单日期止" labelCol="1" fieldCol="2" wrapper="date"/> <div class="col-xs-12 col-sm-1 col-warp checkBoxDiv">
<div><x:checkbox name="zacfmk" label="验收单标记"/></div>
</div>
<div class="col-xs-12 col-sm-2 col-warp checkBoxDiv">
<div><x:checkbox name="zaicsm" label="仅显示未业务标记验收单"/></div>
</div>
</div> </div>
<x:searchButtons/> <div class="hg-form-row">
<x:searchButtons/>
</div>
</form> </form>
<div class="blank_div clearfix"></div> <div class="blank_div clearfix"></div>
......
topsun/src/main/java/com/huigou/topsun/sap/acceptanceFormAck/application/impl/SapAcceptanceFormAckApplicationImpl.java
View file @ a502bde8
package com.huigou.topsun.sap.acceptanceFormAck.application.impl; package com.huigou.topsun.sap.acceptanceFormAck.application.impl;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper; 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.sap.acceptanceFormAck.application.SapAcceptanceFormAckApplication;
import com.huigou.topsun.sap.acceptanceFormAck.domain.SapAcceptanceFormAck;
import com.huigou.topsun.sap.common.HttpClient;
import com.huigou.topsun.util.TestClientHttp; import com.huigou.topsun.util.TestClientHttp;
import com.huigou.util.SDO; import com.huigou.util.SDO;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -18,10 +20,8 @@ import javax.persistence.criteria.CriteriaQuery; ...@@ -18,10 +20,8 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap; import java.util.stream.Collectors;
import java.util.List;
import java.util.Map;
/** /**
@author YourUserName @author YourUserName
...@@ -32,6 +32,8 @@ public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAc ...@@ -32,6 +32,8 @@ public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAc
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final HttpClient httpClient;
@PersistenceContext(unitName = "system") @PersistenceContext(unitName = "system")
private EntityManager entityManager; private EntityManager entityManager;
...@@ -39,11 +41,17 @@ public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAc ...@@ -39,11 +41,17 @@ public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAc
public ArrayList<Map<String, Object>> findAcceptanceForm(SDO sdo) { public ArrayList<Map<String, Object>> findAcceptanceForm(SDO sdo) {
String execute; String execute;
Map<String, Object> param = sdo.getProperties(); Map<String, Object> param = sdo.getProperties();
Set<Object> criteriaParam = setCriteria(param);
String url = "query_dn_mark/query_dn_mark";
List<SapAcceptanceFormAck> acceptanceForms = null; List<SapAcceptanceFormAck> acceptanceForms = null;
try { try {
execute = TestClientHttp.execute(param, "http://127.0.0.1:8080/topsun_xt_war/sapAcceptanceForm/queryAcceptanceForm.ajax"); execute = httpClient.execute(criteriaParam, url);
String resultStr = JSONObject.parseObject(execute).get("data").toString(); //忽略不存在
acceptanceForms = objectMapper.readValue(resultStr, new TypeReference<List<SapAcceptanceFormAck>>() {}); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
//忽略大小写
objectMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
acceptanceForms = objectMapper.readValue(execute, new TypeReference<List<SapAcceptanceFormAck>>() {});
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
...@@ -54,6 +62,47 @@ public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAc ...@@ -54,6 +62,47 @@ public class SapAcceptanceFormAckApplicationImpl implements SapAcceptanceFormAc
}); });
} }
// execute = TestClientHttp.execute(param, "http://127.0.0.1:8080/topsun_xt_war/sapAcceptanceForm/queryAcceptanceForm.ajax");
// String resultStr = JSONObject.parseObject(execute).get("data").toString();
public Set<Object> setCriteria(Map<String, Object> param) {
Map<String, Object> vbeln = new HashMap<>(3);
vbeln.put("VBELN_LOW", param.get("vbeln_low"));
vbeln.put("VBELN_HIGH", param.get("vbeln_high"));
param.put("vbeln", new Object[] { vbeln });
Map<String, Object> bstnk = new HashMap<>(3);
bstnk.put("BSTNK_LOW", param.get("bstnk_low"));
bstnk.put("BSTNK_HIGH", param.get("bstnk_high"));
param.put("bstnk", new Object[] { bstnk });
Map<String, Object> zsckdt = new HashMap<>(3);
zsckdt.put("ZSCKDT_LOW", param.get("zsckdt_low"));
zsckdt.put("ZSCKDT_HIGH", param.get("zsckdt_high"));
param.put("zsckdt", new Object[] { zsckdt });
Map<String, Object> lfdat = new HashMap<>(3);
lfdat.put("LFDAT_LOW", param.get("lfdat_low"));
lfdat.put("LFDAT_HIGH", param.get("lfdat_high"));
param.put("lfdat", new Object[] { lfdat });
Map<String, Object> zinstnum = new HashMap<>(3);
zinstnum.put("ZINSTNUM_LOW", param.get("zinstnum_low"));
zinstnum.put("ZINSTNUM_HIGH", param.get("zinstnum_high"));
param.put("zinstnum", new Object[] { zinstnum });
Map<String, Object> upperCaseMap = param.entrySet().stream()
.collect(Collectors.toMap(
entry -> entry.getKey().toUpperCase(),
Map.Entry::getValue
));
Set<Object> set = new HashSet<>();
set.add(upperCaseMap);
return set;
}
@Override @Override
public String ackAcceptanceForm(SDO sdo) { public String ackAcceptanceForm(SDO sdo) {
String execute; String execute;
......
topsun/src/main/java/com/huigou/topsun/sap/acceptanceFormAck/controller/SapAcceptanceFormAckController.java
View file @ a502bde8
...@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.context.Operator; import com.huigou.context.Operator;
import com.huigou.topsun.sap.acceptanceFormAck.application.SapAcceptanceFormAckApplication; import com.huigou.topsun.sap.acceptanceFormAck.application.SapAcceptanceFormAckApplication;
import com.huigou.topsun.sap.acceptanceFormAck.domain.SapAcceptanceFormAck; 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.ControllerMapping;
import com.huigou.uasp.annotation.SkipAuth; import com.huigou.uasp.annotation.SkipAuth;
import com.huigou.uasp.client.CommonController; import com.huigou.uasp.client.CommonController;
...@@ -53,8 +52,11 @@ public class SapAcceptanceFormAckController extends CommonController { ...@@ -53,8 +52,11 @@ public class SapAcceptanceFormAckController extends CommonController {
public String findAcceptanceForm() { public String findAcceptanceForm() {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
HashMap<Object, Object> map = new HashMap<>(6);
if(sdo.getProperties().size() <= 3) {
return toResult(map);
}
ArrayList<Map<String, Object>> list = ackServer.findAcceptanceForm(sdo); ArrayList<Map<String, Object>> list = ackServer.findAcceptanceForm(sdo);
HashMap<Object, Object> map = new HashMap<>(3);
map.put("Rows", list); map.put("Rows", list);
return toResult(map); return toResult(map);
} }
......
topsun/src/main/java/com/huigou/topsun/sap/acceptanceFormAck/domain/SapAcceptanceFormAck.java
View file @ a502bde8
...@@ -3,7 +3,6 @@ package com.huigou.topsun.sap.acceptanceFormAck.domain; ...@@ -3,7 +3,6 @@ package com.huigou.topsun.sap.acceptanceFormAck.domain;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
import javax.persistence.*; import javax.persistence.*;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
...@@ -11,8 +10,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; ...@@ -11,8 +10,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.huigou.topsun.common.NumberToStringSerializer; import com.huigou.topsun.common.NumberToStringSerializer;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
/** /**
* @author YourUserName * @author YourUserName
...@@ -32,186 +29,242 @@ public class SapAcceptanceFormAck implements Serializable { ...@@ -32,186 +29,242 @@ public class SapAcceptanceFormAck implements Serializable {
private String uuid; private String uuid;
/** /**
* 交货单 * 客户系统验收标记
*/ */
@Column(name = "vbeln", nullable = true, length = 32) @Column(name = "ZCSAMK", nullable = true, length = 1)
private String vbeln; private String zcsamk;
/** /**
* 客户单号 * 销售凭证
*/ */
@Column(name = "bstnk", nullable = true, length = 32) @Column(name = "VGBEL", nullable = true, length = 10)
private String bstnk; private String vgbel;
/** /**
* 指令号 * 销售凭证项目
*/ */
@Column(name = "zinstnum", nullable = true, length = 32) @Column(name = "VGPOS", nullable = true, length = 6)
private String zinstnum; private String vgpos;
/** /**
* 客户(售达方) * 物料编号
*/ */
@Column(name = "kunag", nullable = true, length = 120) @Column(name = "MATNR", nullable = true, length = 40)
private String kunag; private String matnr;
/**
* 物料描述
*/
@Column(name = "MAKTX", nullable = true, length = 40)
private String maktx;
/**
* 销售和分销凭证号
*/
@Column(name = "VBELN", nullable = true, length = 10)
private String vbeln;
/**
* 销售和分销凭证的项目号
*/
@Column(name = "POSNR", nullable = true, length = 8)
private String posnr;
/** /**
* 销售组织: 1000: 广州宝绅科技销售组织; 2000: 广州市金库物联销售组织 * 销售组织
*/ */
@Column(name = "vkorg", nullable = true, length = 10) @Column(name = "VKORG", nullable = true, length = 4)
private String vkorg; private String vkorg;
/** /**
* 业务标记日期 * 售达方
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Column(name = "KUNAG", nullable = true, length = 10)
@Column(name = "zsckdt", nullable = true) private String kunag;
private java.util.Date zsckdt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") /**
@Column(name = "zsckdt_end", nullable = true) * 名称
private java.util.Date zsckdtEnd; */
@Column(name = "NAME1", nullable = true, length = 30)
private String name1;
/** /**
* 交货单日期 * 请款联
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Column(name = "KATR6", nullable = true, length = 2)
@Column(name = "lfdat", nullable = true) private String katr6;
/**
* 交货日期
*/
@JsonFormat(pattern = "yyyyMMdd")
@Column(name = "LFDAT", nullable = true)
private java.util.Date lfdat; private java.util.Date lfdat;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") /**
@Column(name = "lfdat_end", nullable = true) * 客户编号
private java.util.Date lfdatEnd; */
@Column(name = "ZHDLR", nullable = true, length = 12)
private String zhdlr;
/**
* 名称
*/
@Column(name = "ZHDNM", nullable = true, length = 30)
private String zhdnm;
/** /**
* 做账状态(未定): Y: 已做账; N: 未做账 * 验收单标记人
*/ */
@Column(name = "zcors", nullable = true, length = 3) @Column(name = "ZMKP4", nullable = true, length = 32)
private String zcors; private String zmkp4;
/** /**
* 客户验收单要求: Y: 要求; N: 不要求 * 验收单标记时间
*/ */
@Column(name = "zacrc", nullable = true, length = 3) @JsonFormat(pattern = "yyyyMMdd")
private String zacrc; @Column(name = "ZMKT4", nullable = true)
private java.util.Date zmkt4;
/** /**
* 验收单业务标记 * 验收单业务标记
*/ */
@Column(name = "zacsmk", nullable = true, length = 3) @Column(name = "ZACSMK", nullable = true, length = 1)
private String zacsmk; private String zacsmk;
/** /**
* 验收单财务标记 * 验收单业务标记人
*/ */
@Column(name = "zacfmk", nullable = true, length = 3) @Column(name = "ZMKP5", nullable = true, length = 12)
private String zacfmk; private String zmkp5;
/** /**
* 销售订单 * 验收单业务标记时间
*/ */
@Column(name = "VGBEL", nullable = true, length = 255) @JsonFormat(pattern = "yyyyMMdd")
private String vgbel; @Column(name = "ZMKT5", nullable = true)
private java.util.Date zmkt5;
/** /**
* 销售订单行 * 客户物料
*/ */
@Column(name = "VGPOS", nullable = true, length = 255) @Column(name = "KDMAT", nullable = true, length = 35)
private String vgpos; private String kdmat;
/** /**
* 物料编号 * 参考的描述
*/ */
@Column(name = "MATNR", nullable = true, length = 255) @Column(name = "POSTX", nullable = true, length = 40)
private String matnr; private String postx;
/** /**
* 物料名称 * 客户参考
*/ */
@Column(name = "MAKTX", nullable = true, length = 255) @Column(name = "BSTKD", nullable = true, length = 35)
private String maktx; private String bstkd;
/** /**
* 交货单项 * 指令号
*/ */
@Column(name = "POSNR", nullable = true, length = 255) @Column(name = "ZINSN", nullable = true, length = 30)
private String posnr; private String zinsn;
/** /**
* 名称 1 * 型体号
*/ */
@Column(name = "NAME1", nullable = true, length = 255) @Column(name = "ZMOLD", nullable = true, length = 30)
private String name1; private String zmold;
/** /**
* 客户验收单要求 * 配色号
*/ */
@Column(name = "KATR6", nullable = true, length = 255) @Column(name = "ZMAPCOLOR", nullable = true, length = 30)
private String katr6; private String zmapcolor;
/** /**
* 跟单员 * 段别
*/ */
@Column(name = "ZHDLR", nullable = true, length = 255) @Column(name = "ZSEGM", nullable = true, length = 10)
private String zhdlr; private String zsegm;
/** /**
* 跟单员名字 * 实际已交货量（按销售单位）
*/ */
@Column(name = "ZHDNM", nullable = true, length = 255) @Column(name = "LFIMG", nullable = true, length = 33)
private String zhdnm; private String lfimg;
/** /**
* 验收单业务标记人 * 以销售单位表示的累计订购数量
*/ */
@Column(name = "ZMKP4", nullable = true, length = 255) @Column(name = "KWMENG", nullable = true, length = 33)
private String zmkp4; private String kwmeng;
/** /**
* 验收单业务标记日期 * 请款数量
*/ */
@Column(name = "ZMKT4", nullable = true, length = 255) @Column(name = "ZCORQT", nullable = true, length = 20)
private String zmkt4; private String zcorqt;
/** /**
* 客户物料编码 * 销售单位
*/ */
@Column(name = "KDMAT", nullable = true, length = 255) @Column(name = "VRKME", nullable = true, length = 6)
private String kdmat; private String vrkme;
/** /**
* 客户物料名称 * 净价
*/ */
@Column(name = "POSTX", nullable = true, length = 255) @Column(name = "NETPR", nullable = true, length = 22)
private String postx; private String netpr;
/**
* SD 凭证货币
*/
@Column(name = "WAERK", nullable = true, length = 20)
private String waerk;
/**
* 备注
*/
@Column(name = "ZCNOTE", nullable = true, length = 255)
private String zcnote;
/**
* 请款单号
*/
@Column(name = "ZCRNR", nullable = true, length = 12)
private String zcrnr;
/**
* 请款单项次
*/
@Column(name = "ZCRITM", nullable = true, length = 20)
private String zcritm;
/**
* 做账人
*/
@Column(name = "ZCRRSP", nullable = true, length = 16)
private String zcrrsp;
/**
* 做账时间
*/
@JsonFormat(pattern = "yyyyMMdd")
@Column(name = "ZCTIME", nullable = true)
private java.util.Date zctime;
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) { return true; } if (this == o) { return true; }
if (o == null || getClass() != o.getClass()) { return false; } if (o == null || getClass() != o.getClass()) { return false; }
SapAcceptanceFormAck that = (SapAcceptanceFormAck) o; 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); return Objects.equals(uuid, that.uuid) && Objects.equals(zcsamk, that.zcsamk) && Objects.equals(vgbel, that.vgbel) && Objects.equals(vgpos, that.vgpos) && Objects.equals(matnr, that.matnr) && Objects.equals(maktx, that.maktx) && Objects.equals(vbeln, that.vbeln) && Objects.equals(posnr, that.posnr) && Objects.equals(vkorg, that.vkorg) && Objects.equals(kunag, that.kunag) && Objects.equals(name1, that.name1) && Objects.equals(katr6, that.katr6) && Objects.equals(lfdat, that.lfdat) && Objects.equals(zhdlr, that.zhdlr) && Objects.equals(zhdnm, that.zhdnm) && Objects.equals(zmkp4, that.zmkp4) && Objects.equals(zmkt4, that.zmkt4) && Objects.equals(zacsmk, that.zacsmk) && Objects.equals(zmkp5, that.zmkp5) && Objects.equals(zmkt5, that.zmkt5) && Objects.equals(kdmat, that.kdmat) && Objects.equals(postx, that.postx) && Objects.equals(bstkd, that.bstkd) && Objects.equals(zinsn, that.zinsn) && Objects.equals(zmold, that.zmold) && Objects.equals(zmapcolor, that.zmapcolor) && Objects.equals(zsegm, that.zsegm) && Objects.equals(lfimg, that.lfimg) && Objects.equals(kwmeng, that.kwmeng) && Objects.equals(zcorqt, that.zcorqt) && Objects.equals(vrkme, that.vrkme) && Objects.equals(netpr, that.netpr) && Objects.equals(waerk, that.waerk) && Objects.equals(zcnote, that.zcnote) && Objects.equals(zcrnr, that.zcrnr) && Objects.equals(zcritm, that.zcritm) && Objects.equals(zcrrsp, that.zcrrsp) && Objects.equals(zctime, that.zctime);
} }
@Override @Override
public int hashCode() { 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); return Objects.hash(uuid, zcsamk, vgbel, vgpos, matnr, maktx, vbeln, posnr, vkorg, kunag, name1, katr6, lfdat, zhdlr, zhdnm, zmkp4, zmkt4, zacsmk, zmkp5, zmkt5, kdmat, postx, bstkd, zinsn, zmold, zmapcolor, zsegm, lfimg, kwmeng, zcorqt, vrkme, netpr, waerk, zcnote, zcrnr, zcritm, zcrrsp, zctime);
}
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() { public String getUuid() {
...@@ -222,6 +275,46 @@ public class SapAcceptanceFormAck implements Serializable { ...@@ -222,6 +275,46 @@ public class SapAcceptanceFormAck implements Serializable {
this.uuid = uuid; this.uuid = uuid;
} }
public String getZcsamk() {
return this.zcsamk;
}
public void setZcsamk(String zcsamk) {
this.zcsamk = zcsamk;
}
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 getVbeln() { public String getVbeln() {
return this.vbeln; return this.vbeln;
} }
...@@ -230,20 +323,20 @@ public class SapAcceptanceFormAck implements Serializable { ...@@ -230,20 +323,20 @@ public class SapAcceptanceFormAck implements Serializable {
this.vbeln = vbeln; this.vbeln = vbeln;
} }
public String getBstnk() { public String getPosnr() {
return this.bstnk; return this.posnr;
} }
public void setBstnk(String bstnk) { public void setPosnr(String posnr) {
this.bstnk = bstnk; this.posnr = posnr;
} }
public String getZinstnum() { public String getVkorg() {
return this.zinstnum; return this.vkorg;
} }
public void setZinstnum(String zinstnum) { public void setVkorg(String vkorg) {
this.zinstnum = zinstnum; this.vkorg = vkorg;
} }
public String getKunag() { public String getKunag() {
...@@ -254,20 +347,20 @@ public class SapAcceptanceFormAck implements Serializable { ...@@ -254,20 +347,20 @@ public class SapAcceptanceFormAck implements Serializable {
this.kunag = kunag; this.kunag = kunag;
} }
public String getVkorg() { public String getName1() {
return this.vkorg; return this.name1;
} }
public void setVkorg(String vkorg) { public void setName1(String name1) {
this.vkorg = vkorg; this.name1 = name1;
} }
public java.util.Date getZsckdt() { public String getKatr6() {
return this.zsckdt; return this.katr6;
} }
public void setZsckdt(java.util.Date zsckdt) { public void setKatr6(String katr6) {
this.zsckdt = zsckdt; this.katr6 = katr6;
} }
public java.util.Date getLfdat() { public java.util.Date getLfdat() {
...@@ -278,20 +371,36 @@ public class SapAcceptanceFormAck implements Serializable { ...@@ -278,20 +371,36 @@ public class SapAcceptanceFormAck implements Serializable {
this.lfdat = lfdat; this.lfdat = lfdat;
} }
public String getZcors() { public String getZhdlr() {
return this.zcors; return this.zhdlr;
}
public void setZhdlr(String zhdlr) {
this.zhdlr = zhdlr;
} }
public void setZcors(String zcors) { public String getZhdnm() {
this.zcors = zcors; return this.zhdnm;
} }
public String getZacrc() { public void setZhdnm(String zhdnm) {
return this.zacrc; this.zhdnm = zhdnm;
} }
public void setZacrc(String zacrc) { public String getZmkp4() {
this.zacrc = zacrc; return this.zmkp4;
}
public void setZmkp4(String zmkp4) {
this.zmkp4 = zmkp4;
}
public java.util.Date getZmkt4() {
return this.zmkt4;
}
public void setZmkt4(java.util.Date zmkt4) {
this.zmkt4 = zmkt4;
} }
public String getZacsmk() { public String getZacsmk() {
...@@ -302,115 +411,163 @@ public class SapAcceptanceFormAck implements Serializable { ...@@ -302,115 +411,163 @@ public class SapAcceptanceFormAck implements Serializable {
this.zacsmk = zacsmk; this.zacsmk = zacsmk;
} }
public String getZacfmk() { public String getZmkp5() {
return this.zacfmk; return this.zmkp5;
} }
public void setZacfmk(String zacfmk) { public void setZmkp5(String zmkp5) {
this.zacfmk = zacfmk; this.zmkp5 = zmkp5;
} }
public String getVgbel() { public java.util.Date getZmkt5() {
return this.vgbel; return this.zmkt5;
} }
public void setVgbel(String vgbel) { public void setZmkt5(java.util.Date zmkt5) {
this.vgbel = vgbel; this.zmkt5 = zmkt5;
} }
public String getVgpos() { public String getKdmat() {
return this.vgpos; return this.kdmat;
} }
public void setVgpos(String vgpos) { public void setKdmat(String kdmat) {
this.vgpos = vgpos; this.kdmat = kdmat;
} }
public String getMatnr() { public String getPostx() {
return this.matnr; return this.postx;
} }
public void setMatnr(String matnr) { public void setPostx(String postx) {
this.matnr = matnr; this.postx = postx;
} }
public String getMaktx() { public String getBstkd() {
return this.maktx; return this.bstkd;
} }
public void setMaktx(String maktx) { public void setBstkd(String bstkd) {
this.maktx = maktx; this.bstkd = bstkd;
} }
public String getPosnr() { public String getZinsn() {
return this.posnr; return this.zinsn;
} }
public void setPosnr(String posnr) { public void setZinsn(String zinsn) {
this.posnr = posnr; this.zinsn = zinsn;
} }
public String getName1() { public String getZmold() {
return this.name1; return this.zmold;
} }
public void setName1(String name1) { public void setZmold(String zmold) {
this.name1 = name1; this.zmold = zmold;
} }
public String getKatr6() { public String getZmapcolor() {
return this.katr6; return this.zmapcolor;
} }
public void setKatr6(String katr6) { public void setZmapcolor(String zmapcolor) {
this.katr6 = katr6; this.zmapcolor = zmapcolor;
} }
public String getZhdlr() { public String getZsegm() {
return this.zhdlr; return this.zsegm;
} }
public void setZhdlr(String zhdlr) { public void setZsegm(String zsegm) {
this.zhdlr = zhdlr; this.zsegm = zsegm;
} }
public String getZhdnm() { public String getLfimg() {
return this.zhdnm; return this.lfimg;
} }
public void setZhdnm(String zhdnm) { public void setLfimg(String lfimg) {
this.zhdnm = zhdnm; this.lfimg = lfimg;
} }
public String getZmkp4() { public String getKwmeng() {
return this.zmkp4; return this.kwmeng;
} }
public void setZmkp4(String zmkp4) { public void setKwmeng(String kwmeng) {
this.zmkp4 = zmkp4; this.kwmeng = kwmeng;
} }
public String getZmkt4() { public String getZcorqt() {
return this.zmkt4; return this.zcorqt;
} }
public void setZmkt4(String zmkt4) { public void setZcorqt(String zcorqt) {
this.zmkt4 = zmkt4; this.zcorqt = zcorqt;
} }
public String getKdmat() { public String getVrkme() {
return this.kdmat; return this.vrkme;
} }
public void setKdmat(String kdmat) { public void setVrkme(String vrkme) {
this.kdmat = kdmat; this.vrkme = vrkme;
} }
public String getPostx() { public String getNetpr() {
return this.postx; return this.netpr;
} }
public void setPostx(String postx) { public void setNetpr(String netpr) {
this.postx = postx; this.netpr = netpr;
}
public String getWaerk() {
return this.waerk;
}
public void setWaerk(String waerk) {
this.waerk = waerk;
}
public String getZcnote() {
return this.zcnote;
}
public void setZcnote(String zcnote) {
this.zcnote = zcnote;
}
public String getZcrnr() {
return this.zcrnr;
}
public void setZcrnr(String zcrnr) {
this.zcrnr = zcrnr;
}
public String getZcritm() {
return this.zcritm;
}
public void setZcritm(String zcritm) {
this.zcritm = zcritm;
}
public String getZcrrsp() {
return this.zcrrsp;
}
public void setZcrrsp(String zcrrsp) {
this.zcrrsp = zcrrsp;
}
public java.util.Date getZctime() {
return this.zctime;
}
public void setZctime(java.util.Date zctime) {
this.zctime = zctime;
} }
} }
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