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
aceaea43
Commit
aceaea43
authored
Feb 17, 2025
by
1650842865
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、物料类型:半成品ZBCP,产成品ZZCP时,工作计划视图增加一个字段:允许未限制的过量交货(UEETK)默认打上√
2、物料类型:客供料ZKGL时,策略组:(STRGR)默认为:40(具有最终组装的计划)
parent
1f624f31
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
29 additions
and
2 deletions
+29
-2
materialApplyNext.js
...n/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
+1
-1
nonProdApplyNext.js
...in/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
+9
-0
nonProdApplyNext.jsp
...n/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
+1
-1
NonProdApplyDeptApplicationImpl.java
...ply/application/impl/NonProdApplyDeptApplicationImpl.java
+3
-0
SapNonProdApplyDept.java
...u/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
+4
-0
NonProdApplyBasicVo.java
...opsun/sap/nonProdApply/domain/vo/NonProdApplyBasicVo.java
+3
-0
NonProdApplyDeptBaseInfoVo.java
...ap/nonProdApply/domain/vo/NonProdApplyDeptBaseInfoVo.java
+4
-0
ProdApplyToSapVO.java
...u/topsun/sap/nonProdApply/domain/vo/ProdApplyToSapVO.java
+4
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
View file @
aceaea43
...
...
@@ -841,7 +841,7 @@ function bindEvent_mrp(mtart){
if
(
mtart
==
"ZKGL"
){
$
(
"#dismm"
).
val
(
"PD"
);
$
(
"#disls"
).
val
(
"EX"
);
//批量规模
$
(
"#strgr"
).
val
(
"
7
0"
);
//策略组
$
(
"#strgr"
).
val
(
"
4
0"
);
//策略组
$
(
"#dispo"
).
val
(
"105"
);
//MRP控制者
}
if
(
mtart
!=
"ZSHB"
){
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @
aceaea43
...
...
@@ -37,6 +37,13 @@ function initializate() {
$
(
"#dispo"
).
val
(
""
);
//MRP控制者
$
(
"#dispo_text"
).
val
(
""
);
//MRP控制者
}
if
(
data
.
value
==
"ZBCP"
||
data
.
value
==
"ZZCP"
){
$
(
"#ueetk"
).
val
(
"X"
);
//允许未限制的过量交货
$
(
"#ueetk_text"
).
val
(
"是"
);
//允许未限制的过量交货
}
else
{
$
(
"#ueetk"
).
val
(
"0"
);
//允许未限制的过量交货
$
(
"#ueetk_text"
).
val
(
"否"
);
//允许未限制的过量交货
}
}
});
//价格控制 控制财务核算的 不参与成本核算
...
...
@@ -776,6 +783,8 @@ function clearForm_produce() {
$
(
"#fevor"
).
val
(
""
);
// $("#fevorName").val("");
$
(
"#insmk"
).
val
(
""
);
$
(
"#ueetk"
).
val
(
""
);
$
(
"#ueetk_text"
).
val
(
""
);
}
//撤销储存
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @
aceaea43
...
...
@@ -307,7 +307,7 @@
<x:inputC
name=
"ausmeName"
label=
"投料计量单位"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<x:hidden
name=
"ausme"
/>
<x:inputC
name=
"umrenProd"
label=
"转换分母(生产)"
labelCol=
"1"
fieldCol=
"2"
/>
<x:
inputC
name=
"umrezProd"
label=
"转换分子(生产)"
labelCol=
"1"
fieldCol=
"2
"
/>
<x:
selectC
name=
"ueetk"
label=
"允许未限制的过量交货"
labelCol=
"1"
fieldCol=
"2"
dictionary=
"ueetk
"
/>
</div>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"fevor"
label=
"生产主管"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
required=
"false"
/>
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @
aceaea43
...
...
@@ -330,6 +330,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
if
(
"0"
.
equals
(
sapVO
.
getRgekz
())){
sapVO
.
setRgekz
(
""
);
}
if
(
"0"
.
equals
(
sapVO
.
getUeetk
())){
sapVO
.
setUeetk
(
""
);
}
//存储分区标识默认001
sapVO
.
setLgbkz
(
"001"
);
sapVO
.
setMbrsh
(
"M"
);
//行业默认M
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
View file @
aceaea43
...
...
@@ -1003,5 +1003,9 @@ public class SapNonProdApplyDept implements Serializable {
@Column
(
name
=
"MMSTA"
)
private
String
mmsta
;
//允许未限制的过量交货
@Column
(
name
=
"UEETK"
)
private
String
ueetk
;
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 @
aceaea43
...
...
@@ -687,4 +687,7 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
//工厂特定的物料状态
private
String
mmsta
;
//允许未限制的过量交货
private
String
ueetk
;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyDeptBaseInfoVo.java
View file @
aceaea43
...
...
@@ -909,5 +909,9 @@ public class NonProdApplyDeptBaseInfoVo implements Serializable {
@Column
(
name
=
"MMSTA"
)
private
String
mmsta
;
//允许未限制的过量交货
@Column
(
name
=
"UEETK"
)
private
String
ueetk
;
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyToSapVO.java
View file @
aceaea43
...
...
@@ -824,4 +824,8 @@ public class ProdApplyToSapVO {
@JsonProperty
(
"MMSTA"
)
private
String
mmsta
;
//允许未限制的过量交货
@JsonProperty
(
"UEETK"
)
private
String
ueetk
;
}
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