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
036cb5be
Commit
036cb5be
authored
Mar 26, 2024
by
刘学辉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接收SAP产品主数据接口以及分发的调整
parent
46755e1e
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
1022 additions
and
11 deletions
+1022
-11
nonProdApplyList.js
...in/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
+9
-0
nonProdApplyNext.js
...in/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
+2
-1
BsnMessageApplication.java
...sun/base/bsnMessage/appliction/BsnMessageApplication.java
+1
-0
BsnMessageApplicationImpl.java
...bsnMessage/appliction/impl/BsnMessageApplicationImpl.java
+2
-2
NonProdApplyApplication.java
...sap/nonProdApply/application/NonProdApplyApplication.java
+4
-0
NonProdApplyDeptApplication.java
...nonProdApply/application/NonProdApplyDeptApplication.java
+4
-0
NonProdApplyApplicationImpl.java
...odApply/application/impl/NonProdApplyApplicationImpl.java
+83
-6
NonProdApplyDeptApplicationImpl.java
...ply/application/impl/NonProdApplyDeptApplicationImpl.java
+18
-0
NonProdApplyController.java
...n/sap/nonProdApply/controller/NonProdApplyController.java
+34
-0
NonProdApplyNextController.java
...p/nonProdApply/controller/NonProdApplyNextController.java
+9
-2
NonProdApplyBaseInfo.java
.../topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java
+5
-0
ProdApplyFromSapVO.java
...topsun/sap/nonProdApply/domain/vo/ProdApplyFromSapVO.java
+850
-0
NonProdApplyDeptRepository.java
...p/nonProdApply/repository/NonProdApplyDeptRepository.java
+1
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @
036cb5be
...
...
@@ -77,6 +77,15 @@ function loadNonProdApplyListGrid() {
{
display
:
"申请人"
,
name
:
"personMemberName"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"申请部门"
,
name
:
"deptName"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"申请日期"
,
name
:
"fillinDate"
,
width
:
120
,
minWidth
:
60
,
type
:
"date"
,
align
:
"left"
},
{
display
:
"类型"
,
name
:
"kind"
,
width
:
80
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
render
:
function
(
item
){
var
type
=
"物料"
;
if
(
item
.
kind
===
"product"
){
type
=
"产品"
;
}
return
type
;
}
},
{
display
:
"维护类型"
,
name
:
"maintenanceTypeTextView"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"批准人"
,
name
:
"approver"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"批准日期"
,
name
:
"approvalDate"
,
width
:
140
,
minWidth
:
60
,
type
:
"date"
,
align
:
"left"
},
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @
036cb5be
...
...
@@ -250,13 +250,14 @@ function bindEvent() {
$
(
'#spartName'
).
val
(
data
.
VTEXT
);
}
});
$
(
'#meins'
).
searchbox
({
$
(
'#meins
Name
'
).
searchbox
({
type
:
"system"
,
name
:
"dictionary"
,
getParam
:
function
(
item
)
{
return
{
fieldName
:
"MEINS"
}
},
onChange
:
function
(
value
,
data
)
{
$
(
'#meins'
).
val
(
data
.
MSEH3
);
$
(
'#meinsName'
).
val
(
data
.
MSEH3
);
}
});
$
(
'#werksName'
).
searchbox
({
...
...
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/BsnMessageApplication.java
View file @
036cb5be
...
...
@@ -19,6 +19,7 @@ public interface BsnMessageApplication {
*/
String
keepTasks
(
BsnMessageSponsor
bsnMessageSponsor
);
void
saveBsnMessageExecute
(
List
<
BsnMessageExecute
>
all
);
/**
* 发布任务
* @param bId 表单单号
...
...
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/impl/BsnMessageApplicationImpl.java
View file @
036cb5be
...
...
@@ -43,7 +43,7 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
//封装任务发布人自己的审批任务
BsnMessageExecute
execute
=
new
BsnMessageExecute
();
execute
.
setUpdateDate
(
new
Date
());
execute
.
setTaskExecute
(
this
.
getOperator
().
getUserId
());
//
execute.setTaskExecute(this.getOperator().getUserId());
execute
.
setTaskDescribe
(
"各单位已完成[发起人审核]"
);
execute
.
setBusinessCode
(
"system"
);
execute
.
setActive
(
ActiveStatus
.
SAVED
.
getValue
());
...
...
@@ -195,7 +195,7 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
return
keyId
;
}
@Override
public
void
saveBsnMessageExecute
(
List
<
BsnMessageExecute
>
all
)
{
messageExecuteRepository
.
save
(
all
);
}
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyApplication.java
View file @
036cb5be
...
...
@@ -2,6 +2,8 @@ package com.huigou.topsun.sap.nonProdApply.application;
import
com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo
;
import
com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest
;
import
com.huigou.topsun.sap.nonProdApply.domain.vo.ProdApplyFromSapVO
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -31,4 +33,6 @@ public interface NonProdApplyApplication{
//获取变更或扩展前的业务部门
String
getChangeBusinessUsage
(
String
bizId
,
String
type
);
//保存来自SAP的产品申请
void
saveProdApplyFromSapVO
(
ProdApplyFromSapVO
prodApplyFromSapVO
);
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyDeptApplication.java
View file @
036cb5be
...
...
@@ -33,6 +33,10 @@ public interface NonProdApplyDeptApplication {
SapNonProdApplyDept
getNonProdApplyDeptById
(
String
id
);
SapNonProdApplyDept
getNonProdApplyDeptByBaseInfoId
(
String
id
);
SapNonProdApplyDept
getNonProdApplyDeptByMatnr
(
String
matnr
);
void
deleteSapNonProdApplyDept
(
SapNonProdApplyDept
sapNonProdApplyDept
);
/**
* 驳回相关的部门
* @param sdo
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @
036cb5be
...
...
@@ -6,6 +6,8 @@ import com.fasterxml.jackson.core.type.TypeReference;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.google.gson.Gson
;
import
com.huigou.cache.DictUtil
;
import
com.huigou.context.Operator
;
import
com.huigou.context.OrgUnit
;
import
com.huigou.data.query.model.QueryDescriptor
;
import
com.huigou.data.query.model.QueryModel
;
import
com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication
;
...
...
@@ -21,15 +23,12 @@ import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplicatio
import
com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo
;
import
com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept
;
import
com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest
;
import
com.huigou.topsun.sap.nonProdApply.domain.vo.ProdApplyFromSapVO
;
import
com.huigou.topsun.sap.nonProdApply.domain.vo.ProdApplyToSapVO
;
import
com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyBaseInfoRepository
;
import
com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyDeptRepository
;
import
com.huigou.topsun.sap.suppliers.domain.SuppliersBank
;
import
com.huigou.topsun.sap.suppliers.domain.SuppliersBuyer
;
import
com.huigou.topsun.sap.suppliers.domain.SuppliersInfo
;
import
com.huigou.topsun.sap.suppliers.domain.SuppliersPay
;
import
com.huigou.topsun.util.CommonUtil
;
import
com.huigou.uasp.bmp.common.BizBillStatus
;
import
com.huigou.uasp.bmp.operator.OperatorApplication
;
import
com.huigou.uasp.bpm.ApprovalParameter
;
import
com.huigou.uasp.bpm.FlowBroker
;
import
com.huigou.uasp.bpm.HandleResult
;
...
...
@@ -45,6 +44,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.util.*
;
@Service
(
"nonProdApplyApplication"
)
...
...
@@ -63,6 +63,8 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
DefaultHttpClient
defaultHttpClient
;
@Autowired
SapMutualEpLogApplication
sapMutualEpLogApplication
;
@Resource
private
OperatorApplication
operatorApplication
;
@SneakyThrows
@Transactional
(
propagation
=
Propagation
.
REQUIRES_NEW
)
...
...
@@ -81,6 +83,7 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
}
else
{
nonProdApplyBaseInfo
=
(
NonProdApplyBaseInfo
)
commonDomainService
.
loadAndFillinProperties
(
nonProdApplyBaseInfo
);
}
nonProdApplyBaseInfo
.
setKind
(
"materiel"
);
nonProdApplyBaseInfo
=
nonProdApplyBaseInfoRepository
.
save
(
nonProdApplyBaseInfo
);
//是变更或扩展的
if
(
isNew
&&
StringUtil
.
isNotBlank
(
nonProdApplyBaseInfo
.
getSourceId
()))
{
...
...
@@ -271,6 +274,10 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
@Transactional
public
void
deleteNonProdApplyBaseInfoByIds
(
List
<
String
>
ids
)
{
ids
.
forEach
(
this
::
deleteNonProdApplyBaseInfoById
);
for
(
String
id:
ids
)
{
nonProdApplyDeptApplication
.
deleteSapNonProdApplyDept
(
nonProdApplyDeptApplication
.
getNonProdApplyDeptByBaseInfoId
(
id
));
}
}
@Override
...
...
@@ -392,4 +399,74 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
}
return
usedBusiness
;
}
@Override
@Transactional
public
void
saveProdApplyFromSapVO
(
ProdApplyFromSapVO
prodApplyFromSapVO
)
{
//初始化用户信息
String
createdById
=
"5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0"
;
Operator
operator
=
operatorApplication
.
createOperatorByPersonMemberId
(
createdById
);
try
{
NonProdApplyBaseInfo
nonProdApplyBaseInfo
=
new
NonProdApplyBaseInfo
();
SapNonProdApplyDept
sapNonProdApplyDept
=
new
SapNonProdApplyDept
();
ClassHelper
.
copyProperties
(
prodApplyFromSapVO
,
nonProdApplyBaseInfo
);
nonProdApplyBaseInfo
.
setStatusId
(
BizBillStatus
.
COMPLETED
.
getId
());
nonProdApplyBaseInfo
.
setApprover
(
operator
.
getPersonMemberName
());
nonProdApplyBaseInfo
.
setDefaultValues
(
new
OrgUnit
(
operator
.
getFullId
(),
operator
.
getFullName
()));
nonProdApplyBaseInfo
.
setMaintenanceType
(
"new"
);
nonProdApplyBaseInfo
.
setApprovalDate
(
new
Date
());
nonProdApplyBaseInfo
.
setKind
(
"product"
);
nonProdApplyBaseInfo
=
nonProdApplyBaseInfoRepository
.
save
(
nonProdApplyBaseInfo
);
ClassHelper
.
copyProperties
(
prodApplyFromSapVO
,
sapNonProdApplyDept
);
sapNonProdApplyDept
.
setBaseInfoId
(
nonProdApplyBaseInfo
.
getId
());
nonProdApplyDeptApplication
.
save
(
sapNonProdApplyDept
);
//保存基本信息的维护的待办
// saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId(),genericName);
BsnMessageSponsor
bsnMessageSponsor
=
new
BsnMessageSponsor
();
bsnMessageSponsor
.
setTaskSponsor
(
operator
.
getLoginUser
().
getId
());
bsnMessageSponsor
.
setTitle
(
nonProdApplyBaseInfo
.
getGenericName
());
//通用品名
bsnMessageSponsor
.
setExecutorUrl
(
"sapNonProdApplyNext/forwardNonProdApplyNext.do?prod=1"
);
bsnMessageSponsor
.
setBusinessId
(
sapNonProdApplyDept
.
getApplyDeptId
());
bsnMessageSponsor
.
setCreateDate
(
new
Date
());
bsnMessageSponsor
.
setStatus
(
0
);
//List<Map<String, String>> deptStaffList=new ArrayList<>();
//Map <String,String>map=new HashMap<String, String>();
// map.put("");
//deptStaffList.add(map);
// for (Map<String, String> stringMap : deptStaffList) {
BsnMessageExecute
messageExecute
=
new
BsnMessageExecute
();
String
userCode
=
operator
.
getPersonMemberId
();
//stringMap.get("userCode");
String
deptName
=
operator
.
getDeptName
();
//stringMap.get("deptName");
String
deptCode
=
operator
.
getDeptCode
();
//stringMap.get("deptCode");
String
[]
split
=
userCode
.
split
(
"@"
);
messageExecute
.
setTaskExecute
(
split
[
0
]);
messageExecute
.
setBusinessCode
(
deptCode
);
messageExecute
.
setActive
(
ActiveStatus
.
UNFINISHED
.
getValue
());
messageExecute
.
setUpdateDate
(
new
Date
());
messageExecute
.
setTaskDescribe
(
deptName
+
"产品数据维护"
);
//保存任务
// bsnMessageApplication.keepTasks(bsnMessageSponsor);
bsnMessageApplication
.
saveBsnMessageSponsor
(
bsnMessageSponsor
);
messageExecute
.
setMessageSponsorId
(
bsnMessageSponsor
.
getId
());
List
<
BsnMessageExecute
>
executes
=
new
ArrayList
<>();
executes
.
add
(
messageExecute
);
bsnMessageApplication
.
saveBsnMessageExecute
(
executes
);
// bsnMessageApplication.publishTasks(sapNonProdApplyDept.getApplyDeptId());
}
catch
(
Exception
ex
){
ex
.
printStackTrace
();
}
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @
036cb5be
...
...
@@ -8,8 +8,10 @@ import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import
com.huigou.topsun.base.bsnMessage.domain.*
;
import
com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication
;
import
com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo
;
import
com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept
;
import
com.huigou.topsun.sap.nonProdApply.domain.vo.*
;
import
com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyBaseInfoRepository
;
import
com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyDeptRepository
;
import
com.huigou.uasp.bmp.common.application.BaseApplication
;
...
...
@@ -28,14 +30,22 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
NonProdApplyDeptRepository
nonProdApplyDeptRepository
;
@Autowired
BsnMessageApplication
bsnMessageApplication
;
@Autowired
NonProdApplyBaseInfoRepository
nonProdApplyBaseInfoRepository
;
@Override
public
Map
<
String
,
Object
>
saveSapNonProdApplyDept
(
SDO
sdo
){
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
String
businessCode
=
sdo
.
getString
(
"businessCode"
);
String
baseId
=
sdo
.
getString
(
"id"
);
String
genericName
=
sdo
.
getString
(
"genericName"
);
Integer
active
=
sdo
.
getInteger
(
"active"
);
String
meId
=
sdo
.
getString
(
"meId"
);
NonProdApplyBaseInfo
nonProdApplyBaseInfo
=
nonProdApplyBaseInfoRepository
.
findOne
(
sdo
.
getString
(
"id"
));
nonProdApplyBaseInfo
.
setBusinessUsage
(
sdo
.
getString
(
"businessUsage"
));
nonProdApplyBaseInfoRepository
.
save
(
nonProdApplyBaseInfo
);
NonProdApplyDeptVo
deptVo
=
null
;
switch
(
businessCode
)
{
case
"K"
:
...
...
@@ -172,6 +182,14 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
public
SapNonProdApplyDept
getNonProdApplyDeptByBaseInfoId
(
String
baseInfoId
)
{
return
nonProdApplyDeptRepository
.
findByBaseInfoId
(
baseInfoId
);
}
@Override
public
SapNonProdApplyDept
getNonProdApplyDeptByMatnr
(
String
matnr
){
return
nonProdApplyDeptRepository
.
findByMatnr
(
matnr
);
}
@Override
public
void
deleteSapNonProdApplyDept
(
SapNonProdApplyDept
sapNonProdApplyDept
){
nonProdApplyDeptRepository
.
delete
(
sapNonProdApplyDept
);
}
@Override
public
void
rejectNonProdApplyDept
(
SDO
sdo
)
{
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @
036cb5be
...
...
@@ -9,14 +9,21 @@ import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplicatio
import
com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo
;
import
com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept
;
import
com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest
;
import
com.huigou.topsun.sap.nonProdApply.domain.vo.ProdApplyFromSapVO
;
import
com.huigou.topsun.sap.purchaseApproval.controller.SapPurchaseApprovalController
;
import
com.huigou.topsun.sap.purchaseApproval.domain.vo.SapPurchaseApprovalDto
;
import
com.huigou.topsun.sap.suppliers.application.SuppliersDataApplication
;
import
com.huigou.uasp.annotation.ControllerMapping
;
import
com.huigou.uasp.annotation.SkipAuth
;
import
com.huigou.uasp.bmp.common.BizBillStatus
;
import
com.huigou.uasp.client.CommonController
;
import
com.huigou.util.SDO
;
import
com.huigou.util.StringUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
...
...
@@ -33,6 +40,8 @@ public class NonProdApplyController extends CommonController {
@Autowired
NonProdApplyDeptApplication
nonProdApplyDeptApplication
;
private
final
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
NonProdApplyController
.
class
);
public
String
forwardNonProdApplyList
(){
return
forward
(
"nonProdApplyList"
);
}
...
...
@@ -47,6 +56,7 @@ public class NonProdApplyController extends CommonController {
NonProdApplyBaseInfo
nonProdApplyBaseInfo
=
new
NonProdApplyBaseInfo
();
nonProdApplyBaseInfo
.
setMaintenanceType
(
"new"
);
nonProdApplyBaseInfo
.
setApplyType
(
"0"
);
nonProdApplyBaseInfo
.
setKind
(
"materiel"
);
if
(
StringUtil
.
isNotBlank
(
extended
)){
//扩展流程
nonProdApplyBaseInfo
=
nonProdApplyApplication
.
loadNonProdApplyBaseInfoById
(
bizId
);
this
.
putAttribute
(
"processDefinitionKey"
,
NonProdApplyApplication
.
PROCESS_DEFINITION_KEY_EXD
);
...
...
@@ -224,6 +234,30 @@ public class NonProdApplyController extends CommonController {
nonProdApplyApplication
.
publishDataToSap
(
sdo
.
getString
(
"id"
));
return
success
();
}
@SkipAuth
@RequestMapping
(
value
=
"/getSapProductApply"
)
@ResponseBody
public
HashMap
<
String
,
Object
>
getSapProductApply
(
@RequestBody
ProdApplyFromSapVO
prodApplyFromSapVO
){
//SDO sdo = this.getSDO();
HashMap
<
String
,
Object
>
messageMap
=
new
HashMap
<>();
messageMap
.
put
(
"Message_Status"
,
"S"
);
messageMap
.
put
(
"Message_Text"
,
"成功"
);
LOG
.
info
(
"接收SAP产品申请数据=={}"
,
prodApplyFromSapVO
);
try
{
SapNonProdApplyDept
sapNonProdApplyDept
=
nonProdApplyDeptApplication
.
getNonProdApplyDeptByMatnr
(
prodApplyFromSapVO
.
getMatnr
());
if
(
sapNonProdApplyDept
!=
null
){
messageMap
.
put
(
"Message_Status"
,
"E"
);
messageMap
.
put
(
"Message_Text"
,
"物料编号"
+
prodApplyFromSapVO
.
getMatnr
()+
"已经存在!"
);
}
else
{
nonProdApplyApplication
.
saveProdApplyFromSapVO
(
prodApplyFromSapVO
);
}
}
catch
(
RuntimeException
e
){
messageMap
.
put
(
"Message_Status"
,
"E"
);
messageMap
.
put
(
"Message_Text"
,
e
);
}
return
messageMap
;
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java
View file @
036cb5be
...
...
@@ -52,6 +52,10 @@ public class NonProdApplyNextController extends CommonController {
SDO
sdo
=
this
.
getSDO
();
String
id
=
sdo
.
getBizId
();
// this.putAttribute("active", ActiveStatus.UNFINISHED.getValue() );//定义流程环节的id
if
(
StringUtil
.
isNotBlank
(
sdo
.
getString
(
"prod"
))){
SapNonProdApplyDept
applyDept
=
nonProdApplyDeptApplication
.
getNonProdApplyDeptById
(
id
);
id
=
applyDept
.
getBaseInfoId
();
}
NonProdApplyBaseInfo
nonProdApplyBaseInfo
=
nonProdApplyApplication
.
loadNonProdApplyBaseInfoById
(
id
);
nonProdApplyBaseInfo
.
setApplyType
(
"0"
);
this
.
putAttribute
(
"applyType"
,
"0"
);
...
...
@@ -119,8 +123,11 @@ public class NonProdApplyNextController extends CommonController {
}
// String applyDeptId = sdo.getString("applyDeptId");
// List<BsnMessage> bsnMessageAll = bsnMessageApplication.getBsnMessageByBusinessId(applyDeptId);
List
<
String
>
deptList
=
Arrays
.
asList
(
septString
.
split
(
","
));
Map
<
String
,
String
>
serviceusage
=
DictUtil
.
getDictionary
(
"serviceusage"
);
List
<
String
>
deptList
=
new
ArrayList
<>();
if
(
StringUtil
.
isNotBlank
(
septString
)){
deptList
=
Arrays
.
asList
(
septString
.
split
(
","
));
}
Map
<
String
,
String
>
serviceusage
=
DictUtil
.
getDictionary
(
"serviceusage"
);
String
deptId
=
sdo
.
getString
(
"deptId"
);
BsnMessageSponsor
sponsor
=
bsnMessageSponsorRepository
.
findByBusinessId
(
deptId
);
List
<
HashMap
<
String
,
String
>>
list
=
new
ArrayList
<>();
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java
View file @
036cb5be
...
...
@@ -116,6 +116,11 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
@Column
(
name
=
"source_id"
)
private
String
sourceId
;
//materiel表示物料 /product 产品
@Column
(
name
=
"kind"
)
private
String
kind
;
@Transient
private
String
applyType
;
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyFromSapVO.java
0 → 100644
View file @
036cb5be
package
com
.
huigou
.
topsun
.
sap
.
nonProdApply
.
domain
.
vo
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.Data
;
import
javax.persistence.Column
;
import
java.util.Date
;
@Data
public
class
ProdApplyFromSapVO
{
// 批准日期
@JsonProperty
(
"approval_date"
)
private
Date
approvalDate
;
/**
* 批准人
*/
@JsonProperty
(
"approver"
)
private
String
approver
;
/**
* 通用品名
*/
@JsonProperty
(
"generic_name"
)
private
String
genericName
;
/**
* 适用标准
*/
@JsonProperty
(
"applicable_standard"
)
private
String
applicableStandard
;
/**
* 基本计量单位
*/
@JsonProperty
(
"base_unit"
)
private
String
baseUnit
;
/**
* 规格
*/
private
String
specifications
;
/**
* 版式
*/
private
String
design
;
/**
* 尺码
*/
private
String
size
;
/**
* 品牌
*/
private
String
brand
;
/**
* 物料编码
*/
@JsonProperty
(
"MATNR"
)
private
String
matnr
;
/**
* 物料类型
*/
@JsonProperty
(
"MTART"
)
private
String
mtart
;
/**
* 物料组
*/
@JsonProperty
(
"MATKL"
)
private
String
matkl
;
/**
* 集团删除
*/
@JsonProperty
(
"LVORM"
)
private
String
lvorm
;
/**
* 产品组
*/
@JsonProperty
(
"SPART"
)
private
String
spart
;
/**
* 一般销售项次组
*/
@JsonProperty
(
"MTPOS_MARA"
)
private
String
mtposMara
;
/**
* 汉语品名
*/
@JsonProperty
(
"MAKTX"
)
private
String
maktx
;
/**
* 汉语语言
*/
@JsonProperty
(
"SPARS"
)
private
String
spars
;
/**
* 英语品名
*/
@JsonProperty
(
"MAKTX_EN"
)
private
String
maktxEn
;
/**
* 英语语言码
*/
@JsonProperty
(
"SPARS_EN"
)
private
String
sparsEn
;
/**
* 适用标准
*/
@JsonProperty
(
"NORMT"
)
private
String
normt
;
/**
* 批次管理
*/
@JsonProperty
(
"XCHPF"
)
private
String
xchpf
;
/**
* 包装物料组
*/
@JsonProperty
(
"MAGRV"
)
private
String
magrv
;
/**
* 基本计量单位
*/
@JsonProperty
(
"MEINS"
)
private
String
meins
;
@JsonProperty
(
"meins_name"
)
private
String
meinsName
;
/**
* 毛重
*/
@JsonProperty
(
"BRGEW"
)
private
String
brgew
;
/**
* 净重
*/
@JsonProperty
(
"NTGEW"
)
private
String
ntgew
;
/**
* 重量单位
*/
@JsonProperty
(
"GEWEI"
)
private
String
gewei
;
/**
* 体积
*/
@JsonProperty
(
"VOLUM"
)
private
String
volum
;
/**
* 体积单位
*/
@JsonProperty
(
"VOLEH"
)
private
String
voleh
;
/**
* 存储条件
*/
@JsonProperty
(
"RAUBE"
)
private
String
raube
;
/**
* 有效期标识
*/
@JsonProperty
(
"IPRKZ"
)
private
String
iprkz
;
/**
* 最小货架寿命
*/
@JsonProperty
(
"MHDRZ"
)
private
String
mhdrz
;
/**
* 总有效期
*/
@JsonProperty
(
"MHDHB"
)
private
String
mhdhb
;
/**
* 类型
*/
@JsonProperty
(
"KLART"
)
private
String
klart
;
/**
* 分类
*/
@JsonProperty
(
"CLASS"
)
private
String
classify
;
/**
* 销售组织
*/
@JsonProperty
(
"VKORG"
)
private
String
vkorg
;
/**
* 分销渠道
*/
@JsonProperty
(
"VTWEG"
)
private
String
vtweg
;
/**
* 销售计量单位
*/
@JsonProperty
(
"VRKME"
)
private
String
vrkme
;
/**
* 销售计量单位转换分母
*/
@JsonProperty
(
"UMREN_SALE"
)
private
String
umrenSale
;
/**
* 销售计量单位转换分子
*/
@JsonProperty
(
"UMREZ_SALE"
)
private
String
umrezSale
;
/**
* 转换分母
*/
@JsonProperty
(
"UMREN"
)
private
String
umren
;
/**
* 转换分子
*/
@JsonProperty
(
"UMREZ"
)
private
String
umrez
;
/**
* 交货工厂
*/
@JsonProperty
(
"DWERK"
)
private
String
dwerk
;
/**
* 税收发运国
*/
@JsonProperty
(
"ALAND"
)
private
String
aland
;
/**
* 税分类
*/
@JsonProperty
(
"TAXKM"
)
private
String
taxkm
;
/**
* 统计组
*/
@JsonProperty
(
"VERSG"
)
private
String
versg
;
/**
* 物料定价组
*/
@JsonProperty
(
"KONDM"
)
private
String
kondm
;
/**
* 会计科目组
*/
@JsonProperty
(
"KTGRM"
)
private
String
ktgrm
;
/**
* 产品层级
*/
@JsonProperty
(
"PRODH"
)
private
String
prodh
;
/**
* 版式
*/
@JsonProperty
(
"MVGR1"
)
private
String
mvgr1
;
/**
* 品牌
*/
@JsonProperty
(
"MVGR2"
)
private
String
mvgr2
;
/**
* 用途
*/
@JsonProperty
(
"MVGR3"
)
private
String
mvgr3
;
/**
* 备用
*/
@JsonProperty
(
"MVGR4"
)
private
String
mvgr4
;
/**
* 备用
*/
@JsonProperty
(
"MVGR5"
)
private
String
mvgr5
;
/**
* 销售项次组
*/
@JsonProperty
(
"MTPOS"
)
private
String
mtpos
;
/**
* 运输组
*/
@JsonProperty
(
"TRAGR"
)
private
String
tragr
;
/**
* 装载组
*/
@JsonProperty
(
"LADGR"
)
private
String
ladgr
;
/**
* 工厂
*/
@JsonProperty
(
"WERKS"
)
private
String
werks
;
/**
* 采购计量单位
*/
@JsonProperty
(
"BSTME"
)
private
String
bstme
;
@JsonProperty
(
"bstme_name"
)
private
String
bstmeName
;
/**
* 转换分母(采购)
*/
@JsonProperty
(
"UMREN_PURCH"
)
private
String
umrenPurch
;
/**
* 转换分子(采购)
*/
@JsonProperty
(
"UMREZ_PURCH"
)
private
String
umrezPurch
;
/**
* 默认采购组
*/
@JsonProperty
(
"EKGRP"
)
private
String
ekgrp
;
/**
* MPN参数
*/
@JsonProperty
(
"MPROF"
)
private
String
mprof
;
/**
* 工厂(采购)
*/
@JsonProperty
(
"WERKS_PURCH"
)
private
String
werksPurch
;
/**
* 库存地点
*/
@JsonProperty
(
"LGORT"
)
private
String
lgort
;
/**
* MRP组
*/
@JsonProperty
(
"DISGR"
)
private
String
disgr
;
/**
* MRP类型
*/
@JsonProperty
(
"DISMM"
)
private
String
dismm
;
/**
* 重订货点
*/
@JsonProperty
(
"MINBE"
)
private
String
minbe
;
/**
* MRP控制者
*/
@JsonProperty
(
"DISPO"
)
private
String
dispo
;
/**
* 批量规模
*/
@JsonProperty
(
"DISLS"
)
private
String
disls
;
/**
* 固定批量
*/
@JsonProperty
(
"BSTFE"
)
private
String
bstfe
;
/**
* 最大批量
*/
@JsonProperty
(
"BSTMA"
)
private
String
bstma
;
/**
* 最小批量
*/
@JsonProperty
(
"BSTMI"
)
private
String
bstmi
;
/**
* 最大存货水平
*/
@JsonProperty
(
"MABST"
)
private
String
mabst
;
/**
* 设入值
*/
@JsonProperty
(
"BSTRF"
)
private
String
bstrf
;
/**
* 获取类型
*/
@JsonProperty
(
"BESKZ"
)
private
String
beskz
;
/**
* 特殊获取方式
*/
@JsonProperty
(
"SOBSL"
)
private
String
sobsl
;
/**
* 默认生产库存地
*/
@JsonProperty
(
"LGPRO"
)
private
String
lgpro
;
@JsonProperty
(
"lgpro_name"
)
private
String
lgproName
;
/**
* 倒冲标志
*/
@JsonProperty
(
"RGEKZ"
)
private
String
rgekz
;
/**
* 默认采购收货库存地
*/
@JsonProperty
(
"LGFSB"
)
private
String
lgfsb
;
@JsonProperty
(
"lgfsb_name"
)
private
String
lgfsbName
;
/**
* 收货处理天数
*/
@JsonProperty
(
"WEBAZ"
)
private
String
webaz
;
/**
* 自制时间
*/
@JsonProperty
(
"DZEIT"
)
private
String
dzeit
;
/**
* 外部采购交货时间
*/
@JsonProperty
(
"PLIFZ"
)
private
String
plifz
;
/**
* 排程边际码
*/
@JsonProperty
(
"FHORI"
)
private
String
fhori
;
/**
* 安全库存
*/
@JsonProperty
(
"EISBE"
)
private
String
eisbe
;
/**
* 最小安全库存
*/
@JsonProperty
(
"EISLO"
)
private
String
eislo
;
/**
* 策略组
*/
@JsonProperty
(
"STRGR"
)
private
String
strgr
;
/**
* 可用性检查组
*/
@JsonProperty
(
"MTVFP"
)
private
String
mtvfp
;
/**
* 补货提前天数
*/
@JsonProperty
(
"WZEIT"
)
private
String
wzeit
;
/**
* BOM选择方法
*/
@JsonProperty
(
"ALTSL"
)
private
String
altsl
;
/**
* 独立/集中
*/
@JsonProperty
(
"SBDKZ"
)
private
String
sbdkz
;
/**
* 库存地MRP标识
*/
@JsonProperty
(
"DISKZ"
)
private
String
diskz
;
/**
* 投料计量单位
*/
@JsonProperty
(
"AUSME"
)
private
String
ausme
;
@JsonProperty
(
"ausme_name"
)
private
String
ausmeName
;
/**
* 转换分母(生产)
*/
@JsonProperty
(
"UMREN_PROD"
)
private
String
umrenProd
;
/**
* 转换分子(生产)
*/
@JsonProperty
(
"UMREZ_PROD"
)
private
String
umrezProd
;
/**
* 生产计划参数文件
*/
@JsonProperty
(
"SFCPF"
)
private
String
sfcpf
;
/**
* 过账到质检
*/
@JsonProperty
(
"INSMK"
)
private
String
insmk
;
/**
* 工厂(质检)
*/
@JsonProperty
(
"WERKS_QM"
)
private
String
werksQm
;
/**
* 库存地点(质检)
*/
@JsonProperty
(
"LGORT_QM"
)
private
String
lgortQm
;
/**
* 序列号参数
*/
@JsonProperty
(
"SERNP"
)
private
String
sernp
;
/**
* 序列号水平
*/
@JsonProperty
(
"SERLV"
)
private
String
serlv
;
/**
* 利润中心
*/
@JsonProperty
(
"PRCTR"
)
private
String
prctr
;
/**
* 工厂(利润中心)
*/
@JsonProperty
(
"WERKS_PROFIT"
)
private
String
werksProfit
;
/**
* 库存地点(利润中心)
*/
@JsonProperty
(
"LGORT_PROFIT"
)
private
String
lgortProfit
;
/**
* 仓库号
*/
@JsonProperty
(
"LGNUM"
)
private
String
lgnum
;
/**
* 存储类型
*/
@JsonProperty
(
"LGTYP"
)
private
String
lgtyp
;
/**
* 存货下架存储类型
*/
@JsonProperty
(
"LTKZA"
)
private
String
ltkza
;
@JsonProperty
(
"ltkza_name"
)
private
String
ltkzaName
;
/**
* 存货上架存储类型
*/
@JsonProperty
(
"LTKZE"
)
private
String
ltkze
;
@JsonProperty
(
"ltkze_name"
)
private
String
ltkzeName
;
/**
* 存储分区标识
*/
@JsonProperty
(
"LGBKZ"
)
private
String
lgbkz
;
@JsonProperty
(
"lgbkz_name"
)
private
String
lgbkzName
;
/**
* 仓库设施1存储数量
*/
@JsonProperty
(
"LHMG1"
)
private
String
lhmg1
;
/**
* 仓库设施1存储单位
*/
@JsonProperty
(
"LHME1"
)
private
String
lhme1
;
@JsonProperty
(
"lhme1_name"
)
private
String
lhme1Name
;
/**
* 仓库设施1类型
*/
@JsonProperty
(
"LETY1"
)
private
String
lety1
;
/**
* 工厂(文档要求)
*/
@JsonProperty
(
"WERKS_DOC"
)
private
String
werksDoc
;
/**
* 文档要求
*/
@JsonProperty
(
"KZDKZ"
)
private
String
kzdkz
;
/**
* 检验类型
*/
@JsonProperty
(
"ART"
)
private
String
art
;
/**
* 激活标识
*/
@JsonProperty
(
"AKTIV"
)
private
String
aktiv
;
/**
* 过账到质检(质检)
*/
@JsonProperty
(
"INSMK_QM"
)
private
String
insmkQm
;
/**
* 带任务清单检验
*/
@JsonProperty
(
"PPL"
)
private
String
ppl
;
/**
* 自动分配
*/
@JsonProperty
(
"APP"
)
private
String
app
;
/**
* 检查特性
*/
@JsonProperty
(
"MER"
)
private
String
mer
;
/**
* 允许略过
*/
@JsonProperty
(
"DYN"
)
private
String
dyn
;
/**
* 工厂(评估分类)
*/
@JsonProperty
(
"BWKEY"
)
private
String
bwkey
;
/**
* 评估分类
*/
@JsonProperty
(
"BKLAS"
)
private
String
bklas
;
/**
* 价格确定
*/
@JsonProperty
(
"MLAST"
)
private
String
mlast
;
/**
* 价格控制
*/
@JsonProperty
(
"VPRSV"
)
private
String
vprsv
;
/**
* 定价基数
*/
@JsonProperty
(
"PEINH"
)
private
String
peinh
;
/**
* 移动平均价
*/
@JsonProperty
(
"VERPR"
)
private
String
verpr
;
/**
* 标准价
*/
@JsonProperty
(
"STPRS"
)
private
String
stprs
;
/**
* 数量结构
*/
@JsonProperty
(
"EKALR"
)
private
String
ekalr
;
/**
* 不参与成本核算
*/
@JsonProperty
(
"NCOST"
)
private
String
ncost
;
/**
* 物料来源
*/
@JsonProperty
(
"HKMAT"
)
private
String
hkmat
;
/**
* 差异码
*/
@JsonProperty
(
"AWSLS"
)
private
String
awsls
;
/**
* 维护状态(0草稿;1保存;2分发)
*/
// @JsonProperty("STATUS")
// private String status;
@JsonProperty
(
"matkl_name"
)
private
String
matklName
;
@JsonProperty
(
"spart_name"
)
private
String
spartName
;
@JsonProperty
(
"werks_name"
)
private
String
werksName
;
@JsonProperty
(
"lgort_name"
)
private
String
lgortName
;
@JsonProperty
(
"vkorg_name"
)
private
String
vkorgName
;
@JsonProperty
(
"vtweg_name"
)
private
String
vtwegName
;
@JsonProperty
(
"lgnum_name"
)
private
String
lgnumName
;
@JsonProperty
(
"lgtyp_name"
)
private
String
lgtypName
;
@JsonProperty
(
"ekgrp_name"
)
private
String
ekgrpName
;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/repository/NonProdApplyDeptRepository.java
View file @
036cb5be
...
...
@@ -11,4 +11,5 @@ public interface NonProdApplyDeptRepository extends JpaRepository<SapNonProdAppl
SapNonProdApplyDept
findByBaseInfoId
(
String
baseInfoId
);
SapNonProdApplyDept
findByApplyDeptId
(
String
applyDeptId
);
SapNonProdApplyDept
findByMatnr
(
String
matnr
);
}
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