Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doc_wei
Skyeye
提交
66440cb2
S
Skyeye
项目概览
doc_wei
/
Skyeye
通知
1172
Star
154
Fork
127
代码
文件
提交
分支
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看板
提交
66440cb2
编写于
7月 14, 2024
作者:
L
LAPTOP-NDCM9L6Q\王丽雅
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'company_server' of
https://gitee.com/doc_wei01/skyeye
into company_server
上级
2fb02aa2
a32e6cc8
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
144 addition
and
20 deletion
+144
-20
erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js
...c/main/resources/template/js/erpPick/erpReturnPickList.js
+47
-19
erp-produce/src/main/resources/template/js/erpPick/turnReturnMaterialToPut.js
.../resources/template/js/erpPick/turnReturnMaterialToPut.js
+59
-0
erp-produce/src/main/resources/template/tpl/erpPick/erpReturnPickList.html
...ain/resources/template/tpl/erpPick/erpReturnPickList.html
+7
-0
erp-produce/src/main/resources/template/tpl/erpPick/turnReturnMaterialToPut.html
...sources/template/tpl/erpPick/turnReturnMaterialToPut.html
+29
-0
erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js
...s/template/js/turnIocatorManage/addWarehouseLevelValue.js
+1
-1
web/src/main/resources/template/json/skyeyeClassEnum.json
web/src/main/resources/template/json/skyeyeClassEnum.json
+1
-0
未找到文件。
erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js
浏览文件 @
66440cb2
...
...
@@ -24,24 +24,37 @@ layui.config({
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单据编号
'
,
align
:
'
center
'
,
width
:
180
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
machinMation
'
,
rowspan
:
'
2
'
,
title
:
'
加工单
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
machinMation
)
?
''
:
d
.
machinMation
.
oddNumber
}},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
width
:
100
,
templet
:
function
(
d
)
{
return
'
<a lay-event="processDetails" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
state
'
,
title
:
'
状态
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
flowableStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
totalPrice
'
,
title
:
'
物料合计
'
,
align
:
'
left
'
,
width
:
100
},
{
field
:
'
operTime
'
,
title
:
'
单据日期
'
,
align
:
'
center
'
,
width
:
150
},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
200
,
toolbar
:
'
#tableBar
'
}
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
,
rowspan
:
'
2
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
rowspan
:
'
2
'
,
width
:
200
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
var
str
=
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
if
(
!
isNull
(
d
.
fromId
))
{
str
+=
'
<span class="state-new">[转]</span>
'
;
}
return
str
;
}},
{
field
:
'
operTime
'
,
title
:
'
单据日期
'
,
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
140
},
{
colspan
:
'
2
'
,
title
:
'
来源单据信息
'
,
align
:
'
center
'
},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
rowspan
:
'
2
'
,
width
:
100
,
templet
:
function
(
d
)
{
return
'
<a lay-event="processDetails" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
state
'
,
title
:
'
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
erpOrderStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
otherState
'
,
title
:
'
入库状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
putState
"
,
'
id
'
,
d
.
otherState
,
'
name
'
);
}},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
rowspan
:
'
2
'
,
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
200
,
toolbar
:
'
#tableBar
'
}
],
[
{
field
:
'
fromTypeId
'
,
title
:
'
来源类型
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
pickFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
}},
{
field
:
'
fromId
'
,
title
:
'
单据编号
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
]],
done
:
function
(
json
)
{
matchingLanguage
();
...
...
@@ -64,11 +77,26 @@ layui.config({
subApproval
(
data
);
}
else
if
(
layEvent
===
'
processDetails
'
)
{
// 工作流流程详情查看
activitiUtil
.
activitiDetails
(
data
);
}
else
if
(
layEvent
===
'
revoke
'
)
{
//撤销
}
else
if
(
layEvent
===
'
turnReturnMaterialToPut
'
)
{
//转退料入库
turnReturnMaterialToPut
(
data
);
}
else
if
(
layEvent
===
'
revoke
'
)
{
//撤销
revoke
(
data
);
}
});
// 转退料入库
function
turnReturnMaterialToPut
(
data
)
{
_openNewWindows
({
url
:
"
../../tpl/erpPick/turnReturnMaterialToPut.html?id=
"
+
data
.
id
,
title
:
"
转
"
,
pageId
:
"
turnReturnMaterialToPut
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
}
// 添加
$
(
"
body
"
).
on
(
"
click
"
,
"
#addBean
"
,
function
()
{
_openNewWindows
({
...
...
erp-produce/src/main/resources/template/js/erpPick/turnReturnMaterialToPut.js
0 → 100644
浏览文件 @
66440cb2
// 以下两个参数开启团队权限时有值
var
objectId
=
''
,
objectKey
=
''
;
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var
serviceClassName
;
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
var
$
=
layui
.
$
;
var
id
=
GetUrlParam
(
"
id
"
);
// 退料单转退料入库单
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
queryReturnMaterialTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
data
.
erpOrderItemList
=
data
.
pickChildList
$
.
each
(
data
.
erpOrderItemList
,
function
(
index
,
item
){
item
.
operNumber
=
item
.
needNum
item
.
unitPrice
=
item
.
normsMation
.
estimatePurchasePrice
item
.
taxRate
=
0
});
console
.
log
(
data
.
erpOrderItemList
)
// 退料入库的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024071200012
'
,
data
,
{
savePreParams
:
function
(
params
)
{
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertReturnMaterialToTurnOut
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
},
loadComponentCallback
:
function
()
{
$
(
"
select[attrkey='departmentId']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
select[attrkey='farmId']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='requisitionOutLetFromType']
"
).
remove
();
},
tableAddRowCallback
:
function
(
tableId
)
{
$
(
"
#addRow
"
+
tableId
).
remove
();
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.unitPrice
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.amountOfMoney
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.taxRate
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.taxMoney
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.taxUnitPrice
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.taxLastMoney
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.chooseProductBtn
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.normsId
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.warehouse
"
).
prop
(
'
disabled
'
,
true
);
}
});
}});
});
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpPick/erpReturnPickList.html
浏览文件 @
66440cb2
...
...
@@ -34,6 +34,13 @@
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-danger
"
lay
-
event
=
"
revoke
"
>
撤销
<
/a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
state
==
'
pass
'
)
{
}}
{{
#
if
(
d
.
otherState
==
1
||
d
.
otherState
==
2
)
{
}}
{{
#
if
(
auth
(
'
1720873016087
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turnReturnMaterialToPut
"
>
转退料入库
<
/a
>
{{
#
}
}}
{{
#
}
}}
{{
#
}
}}
</script>
</div>
...
...
erp-produce/src/main/resources/template/tpl/erpPick/turnReturnMaterialToPut.html
0 → 100644
浏览文件 @
66440cb2
<!DOCTYPE html>
<html>
<head>
<meta
charset=
"UTF-8"
>
<title></title>
<link
href=
"../../assets/lib/layui/css/layui.css"
rel=
"stylesheet"
/>
<link
href=
"../../assets/lib/winui/css/winui.css"
rel=
"stylesheet"
/>
</head>
<body>
<div
style=
"margin:0 auto;padding:20px;"
>
<form
class=
"layui-form"
action=
""
id=
"showForm"
autocomplete=
"off"
>
<div
id=
"content"
></div>
<div
class=
"layui-form-item layui-col-xs12"
>
<div
class=
"layui-input-block"
>
<button
class=
"winui-btn"
type=
"button"
id=
"cancle"
><language
showName=
"com.skyeye.cancel"
></language></button>
<button
class=
"winui-btn"
lay-submit
lay-filter=
"formSaveDraft"
id=
"formSaveDraft"
>
保存为草稿
</button>
`
<button
class=
"winui-btn"
lay-submit
lay-filter=
"formWriteBean"
id=
"formWriteBean"
>
提交
</button>
</div>
</div>
</form>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
<script
src=
"../../assets/lib/layui/custom.js"
></script>
<script
type=
"text/javascript"
>
layui
.
config
({
base
:
'
../../js/erpPick/
'
}).
use
(
'
turnReturnMaterialToPut
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js
浏览文件 @
66440cb2
...
...
@@ -28,7 +28,7 @@ layui.config({
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
writeDepotLevelVal
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
GE
T
"
,
callback
:
function
(
json
)
{
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
writeDepotLevelVal
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POS
T
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
...
...
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @
66440cb2
...
...
@@ -52,6 +52,7 @@
"machinStateEnum"
:
{
"name"
:
"加工单状态"
,
"className"
:
"skyeye-erp#com.skyeye.machin.classenum.MachinStateEnum"
},
"machinPickStateEnum"
:
{
"name"
:
"加工单领料状态"
,
"className"
:
"skyeye-erp#com.skyeye.machin.classenum.MachinPickStateEnum"
},
"outLetState"
:
{
"name"
:
"领料/补料单出库状态"
,
"className"
:
"skyeye-erp#com.skyeye.pick.classenum.OutLetState"
},
"putState"
:
{
"name"
:
"退料单入库状态"
,
"className"
:
"skyeye-erp#com.skyeye.pick.classenum.PutState"
},
"machinChildStateEnum"
:
{
"name"
:
"工序验收单状态"
,
"className"
:
"skyeye-erp#com.skyeye.machin.classenum.MachinChildStateEnum"
},
"materialNormsCodeInDepot"
:
{
"name"
:
"商品规格一物一码库存状态"
,
"className"
:
"skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeInDepot"
},
"orderItemQualityInspectionType"
:
{
"name"
:
"ERP采购子单据质检类型"
,
"className"
:
"skyeye-erp#com.skyeye.business.classenum.OrderItemQualityInspectionType"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录