Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
topsun-bpm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
鲁鑫
topsun-bpm
Commits
26982d8a
Commit
26982d8a
authored
Jun 14, 2025
by
1650842865
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
采购订单删除;前端显示字段顺序记忆功能优化;采购订单打印优化
parent
5d413cf9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
176 additions
and
74 deletions
+176
-74
UICtrl.js
huigou-xt/src/main/webapp/javaScript/UICtrl.js
+21
-7
payApply.jsp
...main/webapp/biz/topsun/sap/costReimbursement/payApply.jsp
+4
-4
materialApplyNext.js
...n/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
+1
-0
processOutsourceDetail.jsp
...iz/topsun/sap/processOutsource/processOutsourceDetail.jsp
+1
-1
sapPurchaseList.js
...rc/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
+36
-36
purchaseInfoRecordList.js
...z/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.js
+2
-1
purchaseInfoRecordList.jsp
.../topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.jsp
+1
-1
processOuter.ftl
...xt/src/main/webapp/template/print/topsun/processOuter.ftl
+7
-7
processOuter2.ftl
...t/src/main/webapp/template/print/topsun/processOuter2.ftl
+7
-7
ProcessOutsourceApplicationImpl.java
...rce/application/impl/ProcessOutsourceApplicationImpl.java
+7
-0
SapPurchaseInfoRecordController.java
...nfoRecord/controller/SapPurchaseInfoRecordController.java
+1
-1
SapPurchaseInfoRecordQueryRequest.java
...ecord/domain/query/SapPurchaseInfoRecordQueryRequest.java
+1
-0
SapPurchaseOrderApplicationImpl.java
...der/application/impl/SapPurchaseOrderApplicationImpl.java
+73
-7
SapPurchaseOrderItem.java
...topsun/sap/purchaseOrder/domain/SapPurchaseOrderItem.java
+6
-0
SapPurchaseOrderItemVo.java
...n/sap/purchaseOrder/domain/vo/SapPurchaseOrderItemVo.java
+6
-0
sapPurchaseInfoRecord.xml
...opsun/sap/sapPurchaseInfoRecord/sapPurchaseInfoRecord.xml
+2
-2
No files found.
huigou-xt/src/main/webapp/javaScript/UICtrl.js
View file @
26982d8a
...
@@ -55,15 +55,16 @@ UICtrl.getColumnLocal = function(tableKey, allColumns) {
...
@@ -55,15 +55,16 @@ UICtrl.getColumnLocal = function(tableKey, allColumns) {
// 未读取到配置,直接返回默认columns
// 未读取到配置,直接返回默认columns
if
(
!!!
localColumns
)
return
allColumns
if
(
!!!
localColumns
)
return
allColumns
// 有本地配置,与默认配置进行匹配,
// return allColumns.map(column => {
// return {
// ...column,
// hide: localColumns.find(v => v.name == column.name)?._hide
// }
// })
//先按照配置的字段顺序排序
//先按照配置的字段顺序排序
var
newColumns
=
[];
var
newColumns
=
[];
var
uniqueToB
=
getUniqueItems
(
allColumns
,
localColumns
);
if
(
uniqueToB
.
length
>
0
)
{
uniqueToB
.
forEach
(
function
(
item
)
{
newColumns
.
push
(
item
);
})
}
for
(
let
i
=
0
;
i
<
localColumns
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
localColumns
.
length
;
i
++
)
{
for
(
let
j
=
0
;
j
<
allColumns
.
length
;
j
++
)
{
for
(
let
j
=
0
;
j
<
allColumns
.
length
;
j
++
)
{
if
(
allColumns
[
j
].
name
===
localColumns
[
i
].
name
)
{
if
(
allColumns
[
j
].
name
===
localColumns
[
i
].
name
)
{
...
@@ -88,6 +89,19 @@ UICtrl.getColumnLocal = function(tableKey, allColumns) {
...
@@ -88,6 +89,19 @@ UICtrl.getColumnLocal = function(tableKey, allColumns) {
}
}
}
}
// 方法1:使用对象映射提高性能
function
getUniqueItems
(
allColumns
,
localColumns
)
{
// 创建localColumns的name映射
var
localNames
=
{};
$
.
each
(
localColumns
,
function
(
_
,
item
)
{
localNames
[
item
.
name
]
=
true
;
});
return
$
.
grep
(
allColumns
,
function
(
item
)
{
return
!
localNames
.
hasOwnProperty
(
item
.
name
);
});
}
//查询界面回车执行查询
//查询界面回车执行查询
UICtrl
.
initKeyDownQueryGrid
=
function
()
{
UICtrl
.
initKeyDownQueryGrid
=
function
()
{
var
form
=
$
(
'#queryMainForm'
);
var
form
=
$
(
'#queryMainForm'
);
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.jsp
View file @
26982d8a
...
@@ -53,8 +53,8 @@
...
@@ -53,8 +53,8 @@
</div>
</div>
</div>
</div>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"zepFtamount"
required=
"false"
readonly=
"true"
label=
"申请总金额(本位币)"
labelCol=
"2"
fieldCol=
"2"
mask=
"
positiveMoney
"
/>
<x:inputC
name=
"zepFtamount"
required=
"false"
readonly=
"true"
label=
"申请总金额(本位币)"
labelCol=
"2"
fieldCol=
"2"
mask=
"
9999999999.99
"
/>
<x:inputC
name=
"zepFtamount1"
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=
"
9999999999.99
"
/>
<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>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
...
@@ -66,8 +66,8 @@
...
@@ -66,8 +66,8 @@
<x:hidden
name=
"swift"
/>
<x:hidden
name=
"swift"
/>
<x:inputC
name=
"bankl"
required=
"true"
readonly=
"true"
label=
"BP联行号"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"bankl"
required=
"true"
readonly=
"true"
label=
"BP联行号"
labelCol=
"2"
fieldCol=
"2"
/>
<div
id=
"approvalMoney"
>
<div
id=
"approvalMoney"
>
<x:inputC
name=
"zepPtamount"
required=
"false"
readonly=
"true"
label=
"审批总金额(本位币)"
labelCol=
"2"
fieldCol=
"2"
mask=
"
positiveMoney
"
/>
<x:inputC
name=
"zepPtamount"
required=
"false"
readonly=
"true"
label=
"审批总金额(本位币)"
labelCol=
"2"
fieldCol=
"2"
mask=
"
9999999999.99
"
/>
<x:inputC
name=
"zepPtamount1"
required=
"false"
readonly=
"true"
label=
"审批总金额"
labelCol=
"2"
fieldCol=
"2"
mask=
"
positiveMoney
"
/>
<x:inputC
name=
"zepPtamount1"
required=
"false"
readonly=
"true"
label=
"审批总金额"
labelCol=
"2"
fieldCol=
"2"
mask=
"
9999999999.99
"
/>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
View file @
26982d8a
...
@@ -543,6 +543,7 @@ function bindEvent() {
...
@@ -543,6 +543,7 @@ function bindEvent() {
//选择了工厂、库存地点、仓库号,带出存储类型和上下架存储类型
//选择了工厂、库存地点、仓库号,带出存储类型和上下架存储类型
bindEvent_lgtyp
(
$
(
'#werks'
).
val
(),
data
.
LGORT
,
$
(
'#lgnum'
).
val
());
bindEvent_lgtyp
(
$
(
'#werks'
).
val
(),
data
.
LGORT
,
$
(
'#lgnum'
).
val
());
bindEvent_mrp
(
mtart
)
$
(
"#lgpro"
).
val
(
data
.
LGORT
);
$
(
"#lgpro"
).
val
(
data
.
LGORT
);
$
(
"#lgproName"
).
val
(
data
.
LGOBE
);
$
(
"#lgproName"
).
val
(
data
.
LGOBE
);
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.jsp
View file @
26982d8a
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<x:inputC
name=
"amount"
label=
"金额"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
<x:inputC
name=
"amount"
label=
"金额"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
</div>
</div>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:textareaC
name=
"situationDesc"
label=
"情况说明"
labelCol=
"
2"
fieldCol=
"10
"
required=
"true"
rows=
"3"
/>
<x:textareaC
name=
"situationDesc"
label=
"情况说明"
labelCol=
"
1"
fieldCol=
"11
"
required=
"true"
rows=
"3"
/>
</div>
</div>
</div>
</div>
<div
class=
"blank_div clearfix"
></div>
<div
class=
"blank_div clearfix"
></div>
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
View file @
26982d8a
...
@@ -13,42 +13,42 @@ function initUI() {
...
@@ -13,42 +13,42 @@ function initUI() {
function
initPurchaseListGrid
()
{
function
initPurchaseListGrid
()
{
var
toolbarOptions
=
UICtrl
.
getDefaultToolbarOptions
({
var
toolbarOptions
=
UICtrl
.
getDefaultToolbarOptions
({
addHandler
:
addHandler
,
addHandler
:
addHandler
,
//
revokeApproveHandler: {
revokeApproveHandler
:
{
//
id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
id
:
'revokeApproveHandler'
,
text
:
'撤销审批'
,
img
:
'fa-trash'
,
click
:
function
()
{
//
//
var row = purchaseGridManager.getSelectedRow();
var
row
=
purchaseGridManager
.
getSelectedRow
();
//
if (row.status!=3){
if
(
row
.
status
!=
3
){
//
Public.tip("请选择一条已完成的数据!");
Public
.
tip
(
"请选择一条已完成的数据!"
);
//
return;
return
;
//
}
}
//
var loginId = $("#loginId").val();
var
loginId
=
$
(
"#loginId"
).
val
();
//
if (row.personMemberId != loginId) {
if
(
row
.
personMemberId
!=
loginId
)
{
//
Public.tip("只能由创建人撤审!");
Public
.
tip
(
"只能由创建人撤审!"
);
//
return;
return
;
//
}
}
//
UICtrl.showAjaxDialog({
UICtrl
.
showAjaxDialog
({
//
url: web_app.name + '/sapPurchase/showRevokeDetail.load',
url
:
web_app
.
name
+
'/sapPurchase/showRevokeDetail.load'
,
//
param:{id:row.id},
param
:{
id
:
row
.
id
},
//
title: "撤审",
title
:
"撤审"
,
//
width: 400,
width
:
400
,
//
ok: function () {
ok
:
function
()
{
//
Public.ajax(web_app.name + '/sapPurchase/revokeApproval.ajax', {id: row.id,revokeReason: $("#revokeForm #revokeReason").val(),revokeType:$("#revokeType").val()}, function (msg) {
Public
.
ajax
(
web_app
.
name
+
'/sapPurchase/revokeApproval.ajax'
,
{
id
:
row
.
id
,
revokeReason
:
$
(
"#revokeForm #revokeReason"
).
val
(),
revokeType
:
$
(
"#revokeType"
).
val
()},
function
(
msg
)
{
//
purchaseGridManager.loadData();
purchaseGridManager
.
loadData
();
//
});
});
//
}
}
//
});
});
//
// UICtrl.confirm('确定要把当前单据撤销审批吗?',function(){
// UICtrl.confirm('确定要把当前单据撤销审批吗?',function(){
//
// Public.ajax(web_app.name+'/sapPurchase/revokeApproval.ajax', {id:rows[0].id}, function(msg) {
// Public.ajax(web_app.name+'/sapPurchase/revokeApproval.ajax', {id:rows[0].id}, function(msg) {
//
// purchaseGridManager.loadData();
// purchaseGridManager.loadData();
//
// });
// });
//
// });
// });
//
// var newRow = JSON.parse(JSON.stringify(row));
// var newRow = JSON.parse(JSON.stringify(row));
//
// newRow.zepItemno = getZepItemNo();
// newRow.zepItemno = getZepItemNo();
//
/// newRow.id = null;
/// newRow.id = null;
//
// UICtrl.addGridRow(item.gridManager, newRow);
// UICtrl.addGridRow(item.gridManager, newRow);
//
//
}
}
//
}
}
});
});
purchaseGridManager
=
UICtrl
.
grid
(
'#purchaseGrid'
,
{
purchaseGridManager
=
UICtrl
.
grid
(
'#purchaseGrid'
,
{
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.js
View file @
26982d8a
...
@@ -60,6 +60,7 @@ function initPurchaseListGrid() {
...
@@ -60,6 +60,7 @@ function initPurchaseListGrid() {
{
display
:
"单据编号"
,
name
:
"billCode"
,
width
:
150
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"单据编号"
,
name
:
"billCode"
,
width
:
150
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"消息类型"
,
name
:
"typeTextView"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"消息类型"
,
name
:
"typeTextView"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"消息文本"
,
name
:
"message"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"消息文本"
,
name
:
"message"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"状态标识"
,
name
:
"flagTextView"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"采购信息记录编号"
,
name
:
"infnr"
,
width
:
130
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"采购信息记录编号"
,
name
:
"infnr"
,
width
:
130
,
minWidth
:
60
,
type
:
"string"
,
align
:
"center"
},
{
display
:
"工厂"
,
name
:
"werksName"
,
width
:
"200"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"工厂"
,
name
:
"werksName"
,
width
:
"200"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"采购组织"
,
name
:
"ekorgName"
,
width
:
"200"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"采购组织"
,
name
:
"ekorgName"
,
width
:
"200"
,
align
:
"left"
,
type
:
"string"
},
...
@@ -114,7 +115,7 @@ function initPurchaseListGrid() {
...
@@ -114,7 +115,7 @@ function initPurchaseListGrid() {
_tableKey
:
'sapPurchaseInfoRecord'
,
_tableKey
:
'sapPurchaseInfoRecord'
,
_local
:
true
,
_local
:
true
,
url
:
web_app
.
name
+
'/sapPurchaseInfoRecord/slicedSapPurchaseInfoRecordList.ajax?'
,
url
:
web_app
.
name
+
'/sapPurchaseInfoRecord/slicedSapPurchaseInfoRecordList.ajax?'
,
parms
:
{
cancelFlag
:
$
(
"#cancelFlag"
).
val
()
},
parms
:
{},
toolbar
:
toolbarOptions
,
toolbar
:
toolbarOptions
,
width
:
'99.8%'
,
width
:
'99.8%'
,
height
:
'100%'
,
height
:
'100%'
,
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.jsp
View file @
26982d8a
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<div
class=
"col-xs-4 col-sm-2 col-white-bg"
>
<div
class=
"col-xs-4 col-sm-2 col-white-bg"
>
<x:input
name=
"fillinEndDate"
label=
"至"
required=
"false"
wrapper=
"date"
/>
<x:input
name=
"fillinEndDate"
label=
"至"
required=
"false"
wrapper=
"date"
/>
</div>
</div>
<x:selectC
name=
"
cancelFlag"
label=
"作废状态"
labelCol=
"1"
dictionary=
"cancelF
lag"
/>
<x:selectC
name=
"
flag"
label=
"状态标识"
labelCol=
"1"
dictionary=
"f
lag"
/>
</div>
</div>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:checkboxListC
name=
"statusKind"
label=
"common.field.status"
list=
"statusKindsList"
labelCol=
"1"
fieldCol=
"3"
/>
<x:checkboxListC
name=
"statusKind"
label=
"common.field.status"
list=
"statusKindsList"
labelCol=
"1"
fieldCol=
"3"
/>
...
...
topsun-xt/src/main/webapp/template/print/topsun/processOuter.ftl
View file @
26982d8a
...
@@ -81,15 +81,15 @@
...
@@ -81,15 +81,15 @@
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tableBorder"
>
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tableBorder"
>
<colgroup>
<colgroup>
<col
width=
'8%'
/>
<col
width=
'8%'
/>
<col
width=
'
68
%'
/>
<col
width=
'
100
%'
/>
<col
width=
"9%"
/
>
<
#
--
<
col
width=
"9%"
/>
--
>
<col
width=
"15%"
/
>
<
#
--
<
col
width=
"15%"
/>
--
>
</colgroup>
</colgroup>
<tr>
<tr>
<td
class=
"left"
>
交货地点
</td>
<td
class=
"left"
>
交货地点
</td>
<td
class=
"left"
>
${strSuppl?default("")?html}
</td>
<td
class=
"left"
>
${strSuppl?default("")?html}
</td>
<td
class=
"left"
>
仓库
</td
>
<
#
--
<
td
class=
"left"
>
仓库
</td>
--
>
<td
class=
"left"
>
${lgobe?default("")?html}
</td
>
<
#
--
<
td
class=
"left"
>
${lgobe?default("")?html}
</td>
--
>
</tr>
</tr>
</table>
</table>
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tableBorder"
>
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tableBorder"
>
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
<td
class=
"center"
>
包装费用
</td>
<td
class=
"center"
>
包装费用
</td>
<td
class=
"center"
>
总金额
</td>
<td
class=
"center"
>
总金额
</td>
<td
class=
"center"
>
外发工序
</td>
<td
class=
"center"
>
外发工序
</td>
<td
class=
"center"
>
备注
</td>
<td
class=
"center"
>
仓库
</td>
</tr>
</tr>
<
#
list
materialList
as
detail
>
<
#
list
materialList
as
detail
>
<tr>
<tr>
...
@@ -148,7 +148,7 @@
...
@@ -148,7 +148,7 @@
<td
class=
"center"
>
${detail.kbetr3?default("")?html}
</td>
<td
class=
"center"
>
${detail.kbetr3?default("")?html}
</td>
<td
class=
"center"
>
${detail.amount?default("")?html}
</td>
<td
class=
"center"
>
${detail.amount?default("")?html}
</td>
<td
class=
"center"
>
${detail.outProcess01?default("")?html}
</td>
<td
class=
"center"
>
${detail.outProcess01?default("")?html}
</td>
<td
class=
"center"
>
${detail.
remark
?default("")?html}
</td>
<td
class=
"center"
>
${detail.
lgortName
?default("")?html}
</td>
</tr>
</tr>
</
#
list>
</
#
list>
</table>
</table>
...
...
topsun-xt/src/main/webapp/template/print/topsun/processOuter2.ftl
View file @
26982d8a
...
@@ -81,15 +81,15 @@
...
@@ -81,15 +81,15 @@
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tableBorder"
>
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tableBorder"
>
<colgroup>
<colgroup>
<col
width=
'8%'
/>
<col
width=
'8%'
/>
<col
width=
'
68
%'
/>
<col
width=
'
92
%'
/>
<col
width=
"9%"
/
>
<
#
--
<
col
width=
"9%"
/>
--
>
<col
width=
"15%"
/
>
<
#
--
<
col
width=
"15%"
/>
--
>
</colgroup>
</colgroup>
<tr>
<tr>
<td
class=
"left"
>
交货地点
</td>
<td
class=
"left"
>
交货地点
</td>
<td
class=
"left"
>
${strSuppl?default("")?html}
</td>
<td
class=
"left"
>
${strSuppl?default("")?html}
</td>
<td
class=
"left"
>
仓库
</td
>
<
#
--
<
td
class=
"left"
>
仓库
</td>
--
>
<td
class=
"left"
>
${lgobe?default("")?html}
</td
>
<
#
--
<
td
class=
"left"
>
${lgobe?default("")?html}
</td>
--
>
</tr>
</tr>
</table>
</table>
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tableBorder"
>
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tableBorder"
>
...
@@ -130,7 +130,7 @@
...
@@ -130,7 +130,7 @@
<td
class=
"center"
>
包装费用
</td>
<td
class=
"center"
>
包装费用
</td>
<td
class=
"center"
>
总金额
</td>
<td
class=
"center"
>
总金额
</td>
<td
class=
"center"
>
外发工序
</td>
<td
class=
"center"
>
外发工序
</td>
<td
class=
"center"
>
备注
</td>
<td
class=
"center"
>
仓库
</td>
</tr>
</tr>
<
#
list
materialList
as
detail
>
<
#
list
materialList
as
detail
>
<tr>
<tr>
...
@@ -145,7 +145,7 @@
...
@@ -145,7 +145,7 @@
<td
class=
"center"
>
${detail.kbetr3?default("")?html}
</td>
<td
class=
"center"
>
${detail.kbetr3?default("")?html}
</td>
<td
class=
"center"
>
${detail.amount?default("")?html}
</td>
<td
class=
"center"
>
${detail.amount?default("")?html}
</td>
<td
class=
"center"
>
${detail.outProcess01?default("")?html}
</td>
<td
class=
"center"
>
${detail.outProcess01?default("")?html}
</td>
<td
class=
"center"
>
${detail.
remark
?default("")?html}
</td>
<td
class=
"center"
>
${detail.
lgortName
?default("")?html}
</td>
</tr>
</tr>
</
#
list>
</
#
list>
</table>
</table>
...
...
topsun/src/main/java/com/huigou/topsun/sap/processOutsource/application/impl/ProcessOutsourceApplicationImpl.java
View file @
26982d8a
...
@@ -42,6 +42,7 @@ import org.springframework.core.task.TaskExecutor;
...
@@ -42,6 +42,7 @@ import org.springframework.core.task.TaskExecutor;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.Assert
;
import
org.springframework.util.Assert
;
import
org.springframework.util.CollectionUtils
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
...
@@ -368,6 +369,12 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
...
@@ -368,6 +369,12 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
String
execute
=
httpClient
.
executeHttpGetForMes
(
""
,
"v1/workOrder/saleListByArrangeCode?arrangeCode="
+
arrangeNo
);
String
execute
=
httpClient
.
executeHttpGetForMes
(
""
,
"v1/workOrder/saleListByArrangeCode?arrangeCode="
+
arrangeNo
);
Map
<
String
,
Object
>
map
=
JSONObject
.
parseObject
(
execute
,
Map
.
class
);
Map
<
String
,
Object
>
map
=
JSONObject
.
parseObject
(
execute
,
Map
.
class
);
mapList
=
(
List
<
Map
<
String
,
String
>>)
map
.
get
(
"rows"
);
mapList
=
(
List
<
Map
<
String
,
String
>>)
map
.
get
(
"rows"
);
if
(!
CollectionUtils
.
isEmpty
(
mapList
)){
mapList
.
stream
().
forEach
(
map1
->{
String
plnbez
=
map1
.
get
(
"PLNBEZ"
).
toString
();
});
}
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
throw
new
RuntimeException
(
e
);
throw
new
RuntimeException
(
e
);
}
}
...
...
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/controller/SapPurchaseInfoRecordController.java
View file @
26982d8a
...
@@ -46,7 +46,7 @@ public class SapPurchaseInfoRecordController extends CommonController {
...
@@ -46,7 +46,7 @@ public class SapPurchaseInfoRecordController extends CommonController {
private
CodeGenerator
codeGenerator
;
private
CodeGenerator
codeGenerator
;
public
String
forwardSapPurchaseInfoRecordList
(){
public
String
forwardSapPurchaseInfoRecordList
(){
this
.
putAttribute
(
"cancelF
lag"
,
"0"
);
//this.putAttribute("f
lag", "0");
this
.
putAttribute
(
"statusKindsList"
,
BillStatus
.
getValidMap
());
this
.
putAttribute
(
"statusKindsList"
,
BillStatus
.
getValidMap
());
return
forward
(
"purchaseInfoRecordList"
);
return
forward
(
"purchaseInfoRecordList"
);
}
}
...
...
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/query/SapPurchaseInfoRecordQueryRequest.java
View file @
26982d8a
...
@@ -37,4 +37,5 @@ public class SapPurchaseInfoRecordQueryRequest extends QueryAbstractRequest {
...
@@ -37,4 +37,5 @@ public class SapPurchaseInfoRecordQueryRequest extends QueryAbstractRequest {
private
String
statusKind
;
private
String
statusKind
;
private
String
cancelFlag
;
private
String
cancelFlag
;
private
String
flag
;
}
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @
26982d8a
This diff is collapsed.
Click to expand it.
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrderItem.java
View file @
26982d8a
...
@@ -285,4 +285,10 @@ public class SapPurchaseOrderItem extends AbstractEntity {
...
@@ -285,4 +285,10 @@ public class SapPurchaseOrderItem extends AbstractEntity {
*/
*/
@Column
(
name
=
"LTEXT"
)
@Column
(
name
=
"LTEXT"
)
private
String
ltext
;
private
String
ltext
;
/**
* 删除标识
*/
@Column
(
name
=
"LOEKZ"
)
private
String
loekz
;
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderItemVo.java
View file @
26982d8a
...
@@ -187,4 +187,10 @@ public class SapPurchaseOrderItemVo {
...
@@ -187,4 +187,10 @@ public class SapPurchaseOrderItemVo {
@JsonProperty
(
"LTEXT"
)
@JsonProperty
(
"LTEXT"
)
private
String
ltext
;
private
String
ltext
;
/**
* 删除标识
*/
@JsonProperty
(
"LOEKZ"
)
private
String
loekz
;
}
}
\ No newline at end of file
topsun/src/main/resources/config/topsun/sap/sapPurchaseInfoRecord/sapPurchaseInfoRecord.xml
View file @
26982d8a
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<query-mappings>
<query-mappings>
<query
name=
"sapPurchaseInfoRecordList"
label=
"SAP采购信息记录维护申请"
table=
"sap_purchase_info_record"
>
<query
name=
"sapPurchaseInfoRecordList"
label=
"SAP采购信息记录维护申请"
table=
"sap_purchase_info_record"
>
<sql-query>
<sql-query>
select t.bill_code,t.person_member_name,t.dept_name,t.status,t.full_id,t.fillin_date,i.*
select t.bill_code,t.person_member_name,t.dept_name,t.status,t.full_id,t.fillin_date,
t.flag,
i.*
from sap_purchase_info_record t
from sap_purchase_info_record t
left join sap_purchase_info_record_item i
left join sap_purchase_info_record_item i
on t.id = i.sap_purchase_info_record_id
on t.id = i.sap_purchase_info_record_id
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<condition
column=
"person_member_name"
name=
"personMemberName"
type=
"java.lang.String"
symbol=
"like"
alias=
"t"
/>
<condition
column=
"person_member_name"
name=
"personMemberName"
type=
"java.lang.String"
symbol=
"like"
alias=
"t"
/>
<condition
column=
"status"
name=
"statusKind"
type=
"java.lang.Integer"
symbol=
"in"
alias=
"t"
/>
<condition
column=
"status"
name=
"statusKind"
type=
"java.lang.Integer"
symbol=
"in"
alias=
"t"
/>
<condition
column=
"matkl_name"
name=
"matklName"
type=
"java.lang.String"
symbol=
"like"
alias=
"i"
/>
<condition
column=
"matkl_name"
name=
"matklName"
type=
"java.lang.String"
symbol=
"like"
alias=
"i"
/>
<condition
column=
"
cancel_flag"
name=
"cancelFlag"
type=
"java.lang.String"
symbol=
"="
alias=
"i
"
/>
<condition
column=
"
flag"
name=
"flag"
type=
"java.lang.String"
symbol=
"="
alias=
"t
"
/>
</query>
</query>
</query-mappings>
</query-mappings>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment