Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doc_wei
Skyeye
提交
6f0dc1f1
S
Skyeye
项目概览
doc_wei
/
Skyeye
通知
1194
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看板
提交
6f0dc1f1
编写于
7月 15, 2024
作者:
L
LAPTOP-UV1MNL38\18023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat:车间人员、车间物料库存、车间任务功能
上级
a32e6cc8
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
610 addition
and
87 deletion
+610
-87
erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js
...c/main/resources/template/js/erpPick/erpPatchPickToOut.js
+0
-2
erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js
...ce/src/main/resources/template/js/erpPick/erpPickToOut.js
+31
-33
erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js
...c/main/resources/template/js/erpPick/erpReturnPickList.js
+17
-17
erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js
...sources/template/js/erpPick/turnPatchMaterialToTurnOut.js
+3
-4
erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js
...orkshopMaterialInventory/workshopMaterialInventoryList.js
+85
-0
erp-produce/src/main/resources/template/js/workshopPersonnel/workshopPersonnelAllocation.js
...plate/js/workshopPersonnel/workshopPersonnelAllocation.js
+133
-0
erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js
.../resources/template/js/workshopTasks/workshopTasksList.js
+182
-0
erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html
...ain/resources/template/tpl/erpPick/erpPatchPickToOut.html
+17
-15
erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html
...src/main/resources/template/tpl/erpPick/erpPickToOut.html
+17
-15
erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/workshopMaterialInventoryList.html
...kshopMaterialInventory/workshopMaterialInventoryList.html
+32
-0
erp-produce/src/main/resources/template/tpl/workshopPersonnel/workshopPersonnelAllocation.html
...te/tpl/workshopPersonnel/workshopPersonnelAllocation.html
+53
-0
erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html
...sources/template/tpl/workshopTasks/workshopTasksList.html
+39
-0
erp/src/main/resources/template/js/materialCode/batchCopy.js
erp/src/main/resources/template/js/materialCode/batchCopy.js
+1
-1
未找到文件。
erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js
浏览文件 @
6f0dc1f1
...
...
@@ -21,8 +21,6 @@ layui.config({
// 仓库出库的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024070100006
'
,
data
,
{
savePreParams
:
function
(
params
)
{
// params.holderId=data.holderId
// params.holderKey=data.holderKey
},
saveData
:
function
(
params
)
{
// 保存数据
...
...
erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js
浏览文件 @
6f0dc1f1
...
...
@@ -17,38 +17,36 @@ layui.config({
// 领料出库单转仓库出库
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
queryRequisitionOutLetsTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
// 仓库出库的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024070100006
'
,
data
,
{
savePreParams
:
function
(
params
)
{
// params.holderId=data.holderId
// params.holderKey=data.holderKey
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertRequisitionOutLetsToTurnDepot
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
},
loadComponentCallback
:
function
()
{
$
(
"
select[attrkey='holderIdType']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
select[attrkey='holderIdType']
"
).
parent
().
next
().
children
(
'
i
'
).
remove
();
$
(
"
div[controlType='depotOutFromType']
"
).
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
);
}
});
}});
let
data
=
json
.
bean
;
// 仓库出库的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024070100006
'
,
data
,
{
savePreParams
:
function
(
params
)
{
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertRequisitionOutLetsToTurnDepot
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
},
loadComponentCallback
:
function
()
{
$
(
"
select[attrkey='holderIdType']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
select[attrkey='holderIdType']
"
).
parent
().
next
().
children
(
'
i
'
).
remove
();
$
(
"
div[controlType='depotOutFromType']
"
).
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/js/erpPick/erpReturnPickList.js
浏览文件 @
6f0dc1f1
...
...
@@ -26,23 +26,23 @@ layui.config({
cols
:
[[
{
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
;
}},
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>
'
;
}},
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
'
);
}},
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
'
);
}},
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
},
...
...
@@ -50,11 +50,11 @@ layui.config({
{
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
'
);
}},
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
pickFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
}},
{
field
:
'
fromId
'
,
title
:
'
单据编号
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
]],
done
:
function
(
json
)
{
matchingLanguage
();
...
...
@@ -88,7 +88,7 @@ layui.config({
function
turnReturnMaterialToPut
(
data
)
{
_openNewWindows
({
url
:
"
../../tpl/erpPick/turnReturnMaterialToPut.html?id=
"
+
data
.
id
,
title
:
"
转
"
,
title
:
"
转
退料入库
"
,
pageId
:
"
turnReturnMaterialToPut
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
...
...
erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js
浏览文件 @
6f0dc1f1
...
...
@@ -24,7 +24,6 @@ layui.config({
item
.
unitPrice
=
item
.
normsMation
.
estimatePurchasePrice
item
.
taxRate
=
0
});
console
.
log
(
data
.
erpOrderItemList
)
// 补料出库的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024071200002
'
,
data
,
{
savePreParams
:
function
(
params
)
{
...
...
@@ -32,9 +31,9 @@ layui.config({
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertPatchMaterialToTurnOut
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
},
loadComponentCallback
:
function
()
{
$
(
"
select[attrkey='departmentId']
"
).
prop
(
'
disabled
'
,
true
);
...
...
erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js
0 → 100644
浏览文件 @
6f0dc1f1
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
$
=
layui
.
$
,
form
=
layui
.
form
,
table
=
layui
.
table
;
var
selTemplate
=
getFileContent
(
'
tpl/template/select-option.tpl
'
);
// 加载当前用户所属车间
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
queryStaffBelongFarmList
"
,
params
:
{},
type
:
'
json
'
,
method
:
"
GET
"
,
callback
:
function
(
json
)
{
$
(
"
#workshopId
"
).
html
(
getDataUseHandlebars
(
selTemplate
,
json
));
form
.
render
(
'
select
'
);
initTable
();
},
async
:
false
});
var
workshopId
=
""
;
form
.
on
(
'
select(workshopId)
'
,
function
(
data
)
{
var
thisRowValue
=
data
.
value
;
workshopId
=
isNull
(
thisRowValue
)
?
""
:
thisRowValue
;
loadTable
();
});
function
initTable
()
{
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
sysMainMation
.
erpBasePath
+
'
erpdepartstock001
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
true
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
materialMation
'
,
title
:
'
产品
'
,
align
:
'
left
'
,
width
:
120
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
name
}
},
{
field
:
'
normsMation
'
,
title
:
'
规格
'
,
align
:
'
left
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
normsMation
)
?
''
:
d
.
normsMation
.
name
}
},
{
field
:
'
departmentMation
'
,
title
:
'
处理车间
'
,
align
:
'
left
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
departmentMation
)
?
''
:
d
.
departmentMation
.
name
}
},
{
field
:
'
stock
'
,
title
:
'
车间库存
'
,
align
:
'
center
'
,
width
:
80
}
]],
done
:
function
(
json
)
{
matchingLanguage
();
initTableSearchUtil
.
initAdvancedSearch
(
this
,
json
.
searchFilter
,
form
,
"
暂不支持搜索
"
,
function
()
{
table
.
reloadData
(
"
messageTable
"
,
{
page
:
{
curr
:
1
},
where
:
getTableParams
()});
});
}
});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
});
function
loadTable
()
{
table
.
reloadData
(
"
messageTable
"
,
{
where
:
getTableParams
()});
}
function
getTableParams
()
{
var
params
=
{
type
:
'
farm
'
,
objectId
:
workshopId
}
return
$
.
extend
(
true
,
params
,
initTableSearchUtil
.
getSearchValue
(
"
messageTable
"
));
}
exports
(
'
workshopMaterialInventoryList
'
,
{});
});
erp-produce/src/main/resources/template/js/workshopPersonnel/workshopPersonnelAllocation.js
0 → 100644
浏览文件 @
6f0dc1f1
var
rowId
=
""
;
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
$
=
layui
.
$
,
form
=
layui
.
form
,
table
=
layui
.
table
;
authBtn
(
'
1720880910884
'
);
loadWorkshop
();
form
.
render
();
var
chooseWorkshopId
=
""
;
function
loadWorkshop
()
{
table
.
render
({
id
:
'
workshopTable
'
,
elem
:
'
#workshopTable
'
,
method
:
'
get
'
,
url
:
sysMainMation
.
erpBasePath
+
'
queryMyChargeFarmList
'
,
even
:
false
,
page
:
false
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
fixed
:
'
left
'
,
type
:
'
numbers
'
},
{
field
:
'
name
'
,
title
:
'
车间
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
'
<a lay-event="select" class="notice-title-click">
'
+
d
.
name
+
'
</a>
'
;
}}
]],
done
:
function
(
json
)
{
matchingLanguage
();
chooseWorkshopId
=
""
;
loadStaff
(
""
);
}
});
table
.
on
(
'
tool(workshopTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
==
'
select
'
)
{
chooseWorkshopId
=
data
.
id
;
loadStaff
(
data
.
id
);
}
});
}
function
loadStaff
(
workshopId
)
{
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
sysMainMation
.
erpBasePath
+
'
queryFarmStaffList
'
,
where
:
{
objectId
:
workshopId
},
even
:
true
,
page
:
true
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
fixed
:
'
left
'
,
type
:
'
numbers
'
},
{
field
:
'
jobNumber
'
,
title
:
'
工号
'
,
align
:
'
left
'
,
width
:
140
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
staffMation
?.
jobNumber
);
}},
{
field
:
'
userName
'
,
title
:
'
姓名
'
,
width
:
120
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
staffMation
?.
userName
);
}},
{
field
:
'
companyName
'
,
title
:
'
企业
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
staffMation
?.
companyName
);
}},
{
field
:
'
departmentName
'
,
title
:
'
部门
'
,
width
:
140
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
staffMation
?.
departmentName
);
}},
{
field
:
'
jobName
'
,
title
:
'
职位
'
,
width
:
140
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
staffMation
?.
jobName
);
}},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
150
,
toolbar
:
'
#tableBar
'
}
]],
done
:
function
(
json
)
{
matchingLanguage
();
}
});
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
delete
'
)
{
// 删除
delet
(
data
);
}
});
}
// 删除
function
delet
(
data
)
{
layer
.
confirm
(
systemLanguage
[
"
com.skyeye.deleteOperationMsg
"
][
languageType
],
{
icon
:
3
,
title
:
systemLanguage
[
"
com.skyeye.deleteOperation
"
][
languageType
]},
function
(
index
)
{
layer
.
close
(
index
);
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
deleteFarmStaffById
"
,
params
:
{
id
:
data
.
id
},
type
:
'
json
'
,
method
:
"
DELETE
"
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.deleteOperationSuccessMsg
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
table
.
reloadData
(
"
messageTable
"
,
{
page
:
{
curr
:
1
},
where
:
{
objectId
:
chooseWorkshopId
}})
}});
});
}
// 添加
$
(
"
body
"
).
on
(
"
click
"
,
"
#addBean
"
,
function
()
{
if
(
isNull
(
chooseWorkshopId
))
{
winui
.
window
.
msg
(
'
请先选择车间信息.
'
,
{
icon
:
2
,
time
:
2000
});
return
false
;
}
systemCommonUtil
.
userStaffCheckType
=
true
;
// // 人员选择类型,1.多选;其他。单选
systemCommonUtil
.
checkStaffMation
=
[];
// 选择时返回的对象
systemCommonUtil
.
openSysAllUserStaffChoosePage
(
function
(
checkStaffMation
)
{
var
list
=
new
Array
();
console
.
log
(
checkStaffMation
)
$
.
each
(
checkStaffMation
,
function
(
i
,
item
)
{
list
.
push
(
item
.
id
);
});
console
.
log
(
list
)
var
params
=
{
farmId
:
chooseWorkshopId
,
staffId
:
JSON
.
stringify
(
list
)
};
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertFarmStaff
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
loadStaff
(
chooseWorkshopId
);
}});
});
});
exports
(
'
workshopPersonnelAllocation
'
,
{});
});
erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js
0 → 100644
浏览文件 @
6f0dc1f1
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
$
=
layui
.
$
,
form
=
layui
.
form
,
table
=
layui
.
table
;
var
selTemplate
=
getFileContent
(
'
tpl/template/select-option.tpl
'
);
// 加载当前用户所属车间
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
queryStaffBelongFarmList
"
,
params
:
{},
type
:
'
json
'
,
method
:
"
GET
"
,
callback
:
function
(
json
)
{
$
(
"
#workshopId
"
).
html
(
getDataUseHandlebars
(
selTemplate
,
json
));
form
.
render
(
'
select
'
);
initTable
();
},
async
:
false
});
var
workshopId
=
""
;
form
.
on
(
'
select(workshopId)
'
,
function
(
data
)
{
var
thisRowValue
=
data
.
value
;
workshopId
=
isNull
(
thisRowValue
)
?
""
:
thisRowValue
;
loadTable
();
});
//车间任务
function
initTable
()
{
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
sysMainMation
.
erpBasePath
+
'
queryMachinProcedureFarmList
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
true
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
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
(
"
outLetState
"
,
'
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
();
initTableSearchUtil
.
initAdvancedSearch
(
this
,
json
.
searchFilter
,
form
,
"
暂不支持搜索
"
,
function
()
{
table
.
reloadData
(
"
messageTable
"
,
{
page
:
{
curr
:
1
},
where
:
getTableParams
()});
});
}
});
}
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
receive
'
)
{
//接收
receive
(
data
);
}
else
if
(
layEvent
===
'
antiReception
'
)
{
//反接收
antiReception
(
data
);
}
});
// 接收
function
receive
(
data
)
{
layer
.
confirm
(
'
确认要接收该车间任务吗?
'
,
{
icon
:
3
,
title
:
'
接收任务操作
'
},
function
(
index
)
{
activitiUtil
.
startProcess
(
data
.
serviceClassName
,
null
,
function
(
approvalId
)
{
var
params
=
{
id
:
data
.
id
,
};
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
receiveMachinProcedureFarm
"
,
params
:
params
,
type
:
'
json
'
,
method
:
'
POST
'
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
"
接收成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
});
}
function
antiReception
(
data
)
{
layer
.
confirm
(
'
确认要反接收该车间任务吗?
'
,
{
icon
:
3
,
title
:
'
反接收任务操作
'
},
function
(
index
)
{
activitiUtil
.
startProcess
(
data
.
serviceClassName
,
null
,
function
(
approvalId
)
{
var
params
=
{
id
:
data
.
id
,
};
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
receptionReceiveMachinProcedureFarm
"
,
params
:
params
,
type
:
'
json
'
,
method
:
'
POST
'
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
"
反接收成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
});
function
loadTable
()
{
table
.
reloadData
(
"
messageTable
"
,
{
where
:
getTableParams
()});
}
function
getTableParams
(){
var
params
=
{
type
:
'
farm
'
,
objectId
:
workshopId
}
return
$
.
extend
(
true
,
params
,
initTableSearchUtil
.
getSearchValue
(
"
messageTable
"
));
}
exports
(
'
workshopTasksList
'
,
{});
});
erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html
浏览文件 @
6f0dc1f1
<!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"
/>
<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>
<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
(
'
erpPatchPickToOut
'
);
layui
.
config
({
base
:
'
../../js/erpPick/
'
}).
use
(
'
erpPatchPickToOut
'
);
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html
浏览文件 @
6f0dc1f1
<!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"
/>
<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>
<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
(
'
erpPickToOut
'
);
layui
.
config
({
base
:
'
../../js/erpPick/
'
}).
use
(
'
erpPickToOut
'
);
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/workshopMaterialInventoryList.html
0 → 100644
浏览文件 @
6f0dc1f1
<!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
class=
"winui-toolbar"
>
<div
class=
"winui-tool"
>
<form
class=
"layui-form layui-form-pane"
action=
""
autocomplete=
"off"
style=
"width: 50%; float: left;"
>
<select
id=
"workshopId"
name=
"workshopId"
lay-filter=
"workshopId"
lay-search=
""
>
</select>
</form>
<button
id=
"reloadTable"
class=
"winui-toolbtn search-table-btn-right"
><i
class=
"fa fa-refresh"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.refreshDataBtn"
></language></button>
</div>
</div>
<div
style=
"margin:auto 10px;"
>
<table
id=
"messageTable"
lay-filter=
"messageTable"
></table>
<script
type=
"text/html"
id=
"tableBar"
>
</script>
</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/workshopMaterialInventory/
'
}).
use
(
'
workshopMaterialInventoryList
'
);
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/workshopPersonnel/workshopPersonnelAllocation.html
0 → 100644
浏览文件 @
6f0dc1f1
<!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
style=
"background-color: rgb(242, 242, 242);"
>
<div
class=
"layui-fluid"
>
<form
class=
"layui-form"
action=
""
id=
"showForm"
>
<div
class=
"layui-col-xs12 margin-top-10 layui-col-space15"
>
<div
class=
"layui-col-xs3"
>
<div
class=
"layui-card"
>
<div
class=
"layui-card-header"
>
车间
</div>
<div
class=
"layui-card-body"
>
<table
id=
"workshopTable"
lay-filter=
"workshopTable"
></table>
</div>
</div>
</div>
<div
class=
"layui-col-xs9"
>
<div
class=
"layui-card"
>
<div
class=
"layui-card-header"
>
员工
</div>
<div
class=
"layui-card-body"
>
<div
class=
"winui-toolbar"
>
<div
class=
"winui-tool"
>
<button
id=
"addBean"
class=
"winui-toolbtn"
auth=
"1720880928131"
type=
"button"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.addBtn"
></language></button>
</div>
</div>
<div
style=
"margin:auto 10px;"
>
<table
id=
"messageTable"
lay-filter=
"messageTable"
></table>
<script
type=
"text/html"
id=
"tableBar"
>
{{
#
if
(
auth
(
'
1720881295139
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-danger layui-btn-xs
"
lay
-
event
=
"
delete
"
><
language
showName
=
"
com.skyeye.deleteBtn
"
><
/language></
a
>
{{
#
}
}}
</script>
</div>
</div>
</div>
</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/workshopPersonnel/
'
}).
use
(
'
workshopPersonnelAllocation
'
);
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html
0 → 100644
浏览文件 @
6f0dc1f1
<!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
class=
"winui-toolbar"
>
<div
class=
"winui-tool"
>
<form
class=
"layui-form layui-form-pane"
action=
""
autocomplete=
"off"
style=
"width: 50%; float: left;"
>
<select
id=
"workshopId"
name=
"workshopId"
lay-filter=
"workshopId"
lay-search=
""
>
</select>
</form>
<button
id=
"reloadTable"
class=
"winui-toolbtn search-table-btn-right"
><i
class=
"fa fa-refresh"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.refreshDataBtn"
></language></button>
</div>
</div>
<div
style=
"margin:auto 10px;"
>
<table
id=
"messageTable"
lay-filter=
"messageTable"
></table>
<script
type=
"text/html"
id=
"tableBar"
>
{{
#
if
(
d
.
editRow
==
1
)
{
}}
{{
#
if
(
auth
(
'
1720939511614
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
receive
"
>
接收
<
/a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1720939488183
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
antiReception
"
>
反接收
<
/a
>
{{
#
}
}}
{{
#
}
}}
</script>
</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/workshopTasks/
'
}).
use
(
'
workshopTasksList
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/materialCode/batchCopy.js
浏览文件 @
6f0dc1f1
...
...
@@ -64,7 +64,7 @@ layui.config({
}
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
queryNormsBarCodeList
"
,
params
:
params
,
type
:
'
json
'
,
method
:
'
POST
'
,
callback
:
function
(
json
)
{
$
(
"
#barCode
"
).
val
(
json
.
rows
.
join
(
'
\n
'
));
$
(
"
#tips
"
).
html
(
"
共计获取
个
"
+
json
.
total
+
"
条形码
"
);
$
(
"
#tips
"
).
html
(
"
共计获取
"
+
json
.
total
+
"
个
条形码
"
);
}});
}
return
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录