Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
170ec794
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1433
Star
162
Fork
130
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
170ec794
编写于
9月 23, 2022
作者:
W
weizhiqiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
生产模块-加工单,领料单公共代码合并
上级
75a71825
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
64 addition
and
65 deletion
+64
-65
erp-produce/src/main/resources/template/js/erpMachin/erpMachinDetails.js
.../main/resources/template/js/erpMachin/erpMachinDetails.js
+49
-51
erp-produce/src/main/resources/template/js/erpMachin/erpMachinExamine.js
.../main/resources/template/js/erpMachin/erpMachinExamine.js
+2
-1
erp-produce/src/main/resources/template/js/erpMachin/erpMachinStateIsPassNoComplateChoose.js
...late/js/erpMachin/erpMachinStateIsPassNoComplateChoose.js
+2
-2
erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js
...uce/src/main/resources/template/js/erpPick/erpPatchAdd.js
+2
-2
erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js
...ce/src/main/resources/template/js/erpPick/erpPatchEdit.js
+1
-1
erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js
...c/main/resources/template/js/erpPick/erpRequisitionAdd.js
+1
-1
erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js
.../main/resources/template/js/erpPick/erpRequisitionEdit.js
+3
-3
erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinDetails.html
...in/resources/template/tpl/erpMachin/erpMachinDetails.html
+2
-2
erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinExamine.html
...in/resources/template/tpl/erpMachin/erpMachinExamine.html
+2
-2
未找到文件。
erp-produce/src/main/resources/template/js/erpMachin/erpMachinDetails.js
浏览文件 @
170ec794
...
...
@@ -20,58 +20,56 @@ layui.config({
var
$
=
layui
.
$
,
form
=
layui
.
form
;
initData
();
function
initData
(){
showGrid
({
id
:
"
showForm
"
,
url
:
flowableBasePath
+
"
erpmachin006
"
,
params
:
{
rowId
:
parent
.
rowId
},
pagination
:
false
,
template
:
$
(
"
#useTemplate
"
).
html
(),
ajaxSendLoadBefore
:
function
(
hdb
,
json
){
needNum
=
json
.
bean
.
needNum
;
hdb
.
registerHelper
(
'
compare1
'
,
function
(
v1
,
v2
,
options
)
{
return
(
parseFloat
(
v1
)
*
parseFloat
(
v2
)).
toFixed
(
2
);
});
var
loadOperatorBtn
=
false
;
$
.
each
(
json
.
bean
.
procedure
,
function
(
i
,
item
)
{
item
.
unitPrice
=
parseFloat
(
item
.
unitPrice
).
toFixed
(
2
);
if
(
item
.
state
==
1
){
item
.
stateName
=
"
<span class='state-down'>待验收</span>
"
;
if
(
!
loadOperatorBtn
){
loadOperatorBtn
=
true
;
if
(
i
==
(
json
.
bean
.
procedure
.
length
-
1
)){
item
.
operator
=
'
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal acceptance" rowId="
'
+
item
.
id
+
'
" subType="2">生成验收单</button>
'
;
}
else
{
item
.
operator
=
'
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal acceptance" rowId="
'
+
item
.
id
+
'
" subType="1">工序验收</button>
'
;
}
}
else
{
if
(
i
==
(
json
.
bean
.
procedure
.
length
-
1
)){
item
.
operator
=
'
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal layui-btn-disabled">生成验收单</button>
'
;
}
else
{
item
.
operator
=
'
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal layui-btn-disabled">工序验收</button>
'
;
}
}
}
else
if
(
item
.
state
==
2
){
item
.
stateName
=
"
<span class='state-up'>已验收</span>
"
}
});
$
.
each
(
json
.
bean
.
materiel
,
function
(
i
,
item
)
{
item
.
unitPrice
=
parseFloat
(
item
.
unitPrice
).
toFixed
(
2
);
});
showGrid
({
id
:
"
showForm
"
,
url
:
flowableBasePath
+
"
erpmachin006
"
,
params
:
{
id
:
parent
.
rowId
},
pagination
:
false
,
method
:
'
GET
'
,
template
:
$
(
"
#useTemplate
"
).
html
(),
ajaxSendLoadBefore
:
function
(
hdb
,
json
){
needNum
=
json
.
bean
.
needNum
;
hdb
.
registerHelper
(
'
compare1
'
,
function
(
v1
,
v2
,
options
)
{
return
(
parseFloat
(
v1
)
*
parseFloat
(
v2
)).
toFixed
(
2
);
});
var
loadOperatorBtn
=
false
;
$
.
each
(
json
.
bean
.
procedure
,
function
(
i
,
item
)
{
item
.
unitPrice
=
parseFloat
(
item
.
unitPrice
).
toFixed
(
2
);
if
(
item
.
state
==
1
){
item
.
stateName
=
"
<span class='state-down'>待验收</span>
"
;
if
(
!
loadOperatorBtn
){
loadOperatorBtn
=
true
;
if
(
i
==
(
json
.
bean
.
procedure
.
length
-
1
)){
item
.
operator
=
'
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal acceptance" rowId="
'
+
item
.
id
+
'
" subType="2">生成验收单</button>
'
;
}
else
{
item
.
operator
=
'
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal acceptance" rowId="
'
+
item
.
id
+
'
" subType="1">工序验收</button>
'
;
}
}
else
{
if
(
i
==
(
json
.
bean
.
procedure
.
length
-
1
)){
item
.
operator
=
'
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal layui-btn-disabled">生成验收单</button>
'
;
}
else
{
item
.
operator
=
'
<button type="button" class="layui-btn layui-btn-xs layui-btn-normal layui-btn-disabled">工序验收</button>
'
;
}
}
}
else
if
(
item
.
state
==
2
){
item
.
stateName
=
"
<span class='state-up'>已验收</span>
"
}
});
$
.
each
(
json
.
bean
.
material
,
function
(
i
,
item
)
{
item
.
unitPrice
=
parseFloat
(
item
.
unitPrice
).
toFixed
(
2
);
});
$
(
"
#contentIframe
"
).
attr
(
"
src
"
,
"
../../tpl/erpcommon/erpOrderFlowLine.html?rowId=
"
+
json
.
bean
.
id
+
"
&type=3
"
);
},
ajaxSendAfter
:
function
(
json
)
{
matchingLanguage
();
form
.
render
();
}
});
$
(
"
#contentIframe
"
).
attr
(
"
src
"
,
"
../../tpl/erpcommon/erpOrderFlowLine.html?rowId=
"
+
json
.
bean
.
id
+
"
&type=3
"
);
},
ajaxSendAfter
:
function
(
json
)
{
matchingLanguage
();
form
.
render
();
}
});
}
// 打印
$
(
"
body
"
).
on
(
"
click
"
,
"
#jprint
"
,
function
(
e
)
{
$
(
"
#showForm
"
).
jqprint
({
...
...
erp-produce/src/main/resources/template/js/erpMachin/erpMachinExamine.js
浏览文件 @
170ec794
...
...
@@ -15,8 +15,9 @@ layui.config({
showGrid
({
id
:
"
showForm
"
,
url
:
flowableBasePath
+
"
erpmachin006
"
,
params
:
{
rowI
d
:
parent
.
rowId
},
params
:
{
i
d
:
parent
.
rowId
},
pagination
:
false
,
method
:
'
GET
'
,
template
:
$
(
"
#useTemplate
"
).
html
(),
ajaxSendLoadBefore
:
function
(
hdb
)
{
hdb
.
registerHelper
(
'
compare1
'
,
function
(
v1
,
v2
,
options
)
{
...
...
erp-produce/src/main/resources/template/js/erpMachin/erpMachinStateIsPassNoComplateChoose.js
浏览文件 @
170ec794
...
...
@@ -65,8 +65,8 @@ layui.config({
var
chooseIndex
=
JSON
.
stringify
(
dubClick
.
data
(
'
index
'
));
var
obj
=
json
.
rows
[
chooseIndex
];
//根据加工单id获取该单据下的所有单据中商品以及剩余领料数量
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
erpmachin011
"
,
params
:
{
rowId
:
obj
.
id
},
type
:
'
json
'
,
callback
:
function
(
json
)
{
//
根据加工单id获取该单据下的所有单据中商品以及剩余领料数量
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
erpmachin011
"
,
params
:
{
id
:
obj
.
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
obj
.
norms
=
[].
concat
(
json
.
rows
);
parent
.
machinMation
=
obj
;
...
...
erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js
浏览文件 @
170ec794
...
...
@@ -215,8 +215,8 @@ layui.config({
//单位回显
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
html
(
getDataUseHandlebars
(
selOption
,
{
rows
:
item
.
unitList
}));
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
val
(
item
.
normsId
);
//商品回显
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
productName
+
"
(
"
+
item
.
product
Model
+
"
)
"
);
//商品回显
materialModel
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
materialName
+
"
(
"
+
item
.
material
Model
+
"
)
"
);
$
(
"
#currentTock
"
+
(
rowNum
-
1
)).
html
(
item
.
currentTock
);
//库存回显
//补充数量
$
(
"
#rkNum
"
+
(
rowNum
-
1
)).
val
(
0
);
...
...
erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js
浏览文件 @
170ec794
...
...
@@ -251,7 +251,7 @@ layui.config({
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
html
(
getDataUseHandlebars
(
selOption
,
{
rows
:
item
.
unitList
}));
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
val
(
item
.
normsId
);
//商品回显
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
productName
+
"
(
"
+
item
.
product
Model
+
"
)
"
);
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
materialName
+
"
(
"
+
item
.
material
Model
+
"
)
"
);
$
(
"
#currentTock
"
+
(
rowNum
-
1
)).
html
(
item
.
currentTock
);
//库存回显
//建议数量
$
(
"
#rkNum
"
+
(
rowNum
-
1
)).
val
(
0
);
...
...
erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js
浏览文件 @
170ec794
...
...
@@ -218,7 +218,7 @@ layui.config({
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
html
(
getDataUseHandlebars
(
selOption
,
{
rows
:
item
.
unitList
}));
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
val
(
item
.
normsId
);
//商品回显
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
productName
+
"
(
"
+
item
.
product
Model
+
"
)
"
);
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
materialName
+
"
(
"
+
item
.
material
Model
+
"
)
"
);
$
(
"
#currentTock
"
+
(
rowNum
-
1
)).
html
(
item
.
currentTock
);
//库存回显
//所需领料总数量
$
(
"
#productionNum
"
+
(
rowNum
-
1
)).
html
(
item
.
needNumber
);
...
...
erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js
浏览文件 @
170ec794
...
...
@@ -39,7 +39,7 @@ layui.config({
});
function
loadData
(){
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
erppick005
"
,
params
:
{
rowId
:
parent
.
rowId
},
type
:
'
json
'
,
callback
:
function
(
json
)
{
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
erppick005
"
,
params
:
{
id
:
parent
.
rowId
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
var
data
=
json
.
bean
;
if
(
!
isNull
(
data
.
machinId
)){
$
(
"
#machinOrder
"
).
val
(
data
.
machinNum
);
...
...
@@ -60,7 +60,7 @@ layui.config({
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
html
(
getDataUseHandlebars
(
selOption
,
{
rows
:
item
.
unitList
}));
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
val
(
item
.
normsId
);
//商品回显
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
productName
+
"
(
"
+
item
.
product
Model
+
"
)
"
);
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
materialName
+
"
(
"
+
item
.
material
Model
+
"
)
"
);
$
(
"
#currentTock
"
+
(
rowNum
-
1
)).
html
(
item
.
currentTock
);
//库存回显
$
.
each
(
data
.
machinToMation
,
function
(
j
,
bean
){
if
(
bean
.
normsId
==
item
.
normsId
){
...
...
@@ -263,7 +263,7 @@ layui.config({
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
html
(
getDataUseHandlebars
(
selOption
,
{
rows
:
item
.
unitList
}));
$
(
"
#unitId
"
+
(
rowNum
-
1
)).
val
(
item
.
normsId
);
//商品回显
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
productName
+
"
(
"
+
item
.
product
Model
+
"
)
"
);
$
(
"
#materialId
"
+
(
rowNum
-
1
)).
val
(
item
.
materialName
+
"
(
"
+
item
.
material
Model
+
"
)
"
);
$
(
"
#currentTock
"
+
(
rowNum
-
1
)).
html
(
item
.
currentTock
);
//库存回显
//所需领料总数量
$
(
"
#productionNum
"
+
(
rowNum
-
1
)).
html
(
item
.
needNumber
);
...
...
erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinDetails.html
浏览文件 @
170ec794
...
...
@@ -160,9 +160,9 @@
<
/tr
>
<
/thead
>
<
tbody
id
=
"
useTable
"
>
{{
#
each
materi
e
l
}}
{{
#
each
materi
a
l
}}
<
tr
>
<
td
>
{{
productName
}}({{
product
Model
}})
<
/td
>
<
td
>
{{
materialName
}}({{
material
Model
}})
<
/td
>
<
td
>
{{
unitName
}}
<
/td
>
<
td
>
{{
needNumber
}}
<
/td
>
<
td
>
{{
unitPrice
}}
<
/td
>
...
...
erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinExamine.html
浏览文件 @
170ec794
...
...
@@ -132,9 +132,9 @@
<
/tr
>
<
/thead
>
<
tbody
id
=
"
useTable
"
class
=
"
insurance-table
"
>
{{
#
each
materi
e
l
}}
{{
#
each
materi
a
l
}}
<
tr
>
<
td
>
{{
productName
}}({{
product
Model
}})
<
/td
>
<
td
>
{{
materialName
}}({{
material
Model
}})
<
/td
>
<
td
>
{{
unitName
}}
<
/td
>
<
td
>
{{
needNumber
}}
<
/td
>
<
td
>
{{
unitPrice
}}
<
/td
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录