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
23dd745d
Commit
23dd745d
authored
Sep 10, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
原材料增加物料长宽高属性
parent
67a4f76d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
107 additions
and
2 deletions
+107
-2
nonProdApplyNext.jsp
...n/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
+7
-0
NonProdApplyDeptApplicationImpl.java
...ply/application/impl/NonProdApplyDeptApplicationImpl.java
+16
-0
SapNonProdApplyDept.java
...u/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
+24
-2
NonProdApplyBasicVo.java
...opsun/sap/nonProdApply/domain/vo/NonProdApplyBasicVo.java
+19
-0
ProdApplyBomTextVo.java
...topsun/sap/nonProdApply/domain/vo/ProdApplyBomTextVo.java
+38
-0
ProdApplyToSapVO.java
...u/topsun/sap/nonProdApply/domain/vo/ProdApplyToSapVO.java
+3
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @
23dd745d
...
@@ -143,6 +143,13 @@
...
@@ -143,6 +143,13 @@
<x:inputC
name=
"mhdrz"
label=
"最小货架寿命"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"mhdrz"
label=
"最小货架寿命"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"normt"
label=
"适用行业标准"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"normt"
label=
"适用行业标准"
labelCol=
"1"
fieldCol=
"2"
/>
<x:inputC
name=
"length"
label=
"长度cm"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"widthCm"
label=
"宽度cm"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"thickness"
label=
"厚度cm"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"weight"
label=
"克重g"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"singleThickness"
label=
"单层厚"
labelCol=
"1"
fieldCol=
"2"
mask=
"999999.9999"
/>
<x:inputC
name=
"klart"
label=
"类型"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
<x:inputC
name=
"klart"
label=
"类型"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
<x:inputC
name=
"classify"
label=
"分类"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
<x:inputC
name=
"classify"
label=
"分类"
labelCol=
"1"
fieldCol=
"2"
readonly=
"true"
/>
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @
23dd745d
...
@@ -469,6 +469,22 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
...
@@ -469,6 +469,22 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
url
=
"bd_mastdata/material02"
;
url
=
"bd_mastdata/material02"
;
busiType
=
"产品主数据推送SAP"
;
busiType
=
"产品主数据推送SAP"
;
}
}
/**
* 封装EP BOM原材料信息
*/
StringBuilder
bomText
=
new
StringBuilder
();
bomText
.
append
(
applyDept
.
getLength
())
.
append
(
","
)
.
append
(
applyDept
.
getWidthCm
())
.
append
(
","
)
.
append
(
applyDept
.
getThickness
())
.
append
(
","
)
.
append
(
applyDept
.
getWeight
())
.
append
(
","
)
.
append
(
applyDept
.
getSingleThickness
());
sapVO
.
setBomText
(
bomText
.
toString
());
List
<
ProdApplyToSapVO
>
mapList
=
new
ArrayList
<>();
List
<
ProdApplyToSapVO
>
mapList
=
new
ArrayList
<>();
mapList
.
add
(
sapVO
);
mapList
.
add
(
sapVO
);
//日志记录
//日志记录
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
View file @
23dd745d
package
com
.
huigou
.
topsun
.
sap
.
nonProdApply
.
domain
;
package
com
.
huigou
.
topsun
.
sap
.
nonProdApply
.
domain
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.annotations.GenericGenerator
;
import
org.hibernate.annotations.GenericGenerator
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
...
@@ -969,5 +968,28 @@ public class SapNonProdApplyDept implements Serializable {
...
@@ -969,5 +968,28 @@ public class SapNonProdApplyDept implements Serializable {
@Transient
@Transient
private
Date
createdDate
;
private
Date
createdDate
;
/**
*EP BOM原材料信息
*/
//长度cm
@Column
(
name
=
"length"
)
private
BigDecimal
length
;
//宽度cm
@Column
(
name
=
"width_cm"
)
private
BigDecimal
widthCm
;
//厚度cm
@Column
(
name
=
"thickness"
)
private
BigDecimal
thickness
;
//克重g
@Column
(
name
=
"weight"
)
private
BigDecimal
weight
;
//单层厚
@Column
(
name
=
"single_thickness"
)
private
BigDecimal
singleThickness
;
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyBasicVo.java
View file @
23dd745d
...
@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.nonProdApply.domain.vo;
...
@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.nonProdApply.domain.vo;
import
lombok.Data
;
import
lombok.Data
;
import
javax.persistence.Column
;
import
javax.persistence.Column
;
import
java.math.BigDecimal
;
@Data
@Data
public
class
NonProdApplyBasicVo
extends
NonProdApplyDeptVo
{
public
class
NonProdApplyBasicVo
extends
NonProdApplyDeptVo
{
...
@@ -662,4 +663,22 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
...
@@ -662,4 +663,22 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
//销售评估类
//销售评估类
private
String
eklas
;
private
String
eklas
;
/**
*EP BOM原材料信息
*/
//长度cm
private
BigDecimal
length
;
//宽度cm
private
BigDecimal
widthCm
;
//厚度cm
private
BigDecimal
thickness
;
//克重g
private
BigDecimal
weight
;
//单层厚
private
BigDecimal
singleThickness
;
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyBomTextVo.java
0 → 100644
View file @
23dd745d
package
com
.
huigou
.
topsun
.
sap
.
nonProdApply
.
domain
.
vo
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
* @Auther: xin.lu
* @Date: 2024/09/05/15:43
* @Description:
*/
@Data
public
class
ProdApplyBomTextVo
implements
Serializable
{
/**
*EP BOM原材料信息
*/
//长度cm
@JsonProperty
(
"length"
)
private
BigDecimal
length
;
//宽度cm
@JsonProperty
(
"widthCm"
)
private
BigDecimal
widthCm
;
//厚度cm
@JsonProperty
(
"thickness"
)
private
BigDecimal
thickness
;
//克重g
@JsonProperty
(
"weight"
)
private
BigDecimal
weight
;
//单层厚
@JsonProperty
(
"singleThickness"
)
private
BigDecimal
singleThickness
;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyToSapVO.java
View file @
23dd745d
...
@@ -818,4 +818,7 @@ public class ProdApplyToSapVO {
...
@@ -818,4 +818,7 @@ public class ProdApplyToSapVO {
@JsonProperty
(
"TMARM"
)
@JsonProperty
(
"TMARM"
)
private
List
<
Map
<
String
,
Object
>>
mapList
;
private
List
<
Map
<
String
,
Object
>>
mapList
;
@JsonProperty
(
"VOLUME"
)
private
String
bomText
;
}
}
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