Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
8266b3f5
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1431
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看板
提交
8266b3f5
编写于
7月 17, 2024
作者:
L
LAPTOP-NDCM9L6Q\王丽雅
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'company_server' of
https://gitee.com/doc_wei01/skyeye
into company_server
上级
b79b6f53
fb758aeb
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
416 addition
and
64 deletion
+416
-64
erp-produce/src/main/resources/template/js/erpDepartStock/departmentalInventoryDetails.js
...emplate/js/erpDepartStock/departmentalInventoryDetails.js
+81
-0
erp-produce/src/main/resources/template/js/erpDepartStock/erpDepartStockList.js
...esources/template/js/erpDepartStock/erpDepartStockList.js
+25
-1
erp-produce/src/main/resources/template/js/erpPick/erpReturnPickToPut.js
.../main/resources/template/js/erpPick/erpReturnPickToPut.js
+1
-2
erp-produce/src/main/resources/template/js/erpPick/turnReturnMaterialToPut.js
.../resources/template/js/erpPick/turnReturnMaterialToPut.js
+1
-1
erp-produce/src/main/resources/template/js/materialReceiptForm/materialsAwaitingToReceipt.js
...late/js/materialReceiptForm/materialsAwaitingToReceipt.js
+29
-33
erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderList.js
...emplate/js/materialReturnOrder/materialReturnOrderList.js
+7
-2
erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderToPut.js
...mplate/js/materialReturnOrder/materialReturnOrderToPut.js
+57
-0
erp-produce/src/main/resources/template/js/materialReturnOrder/materialsAwaitingToReturn.js
...plate/js/materialReturnOrder/materialsAwaitingToReturn.js
+0
-3
erp-produce/src/main/resources/template/js/materialsAwaitingConfirmation/materialsAwaitingConfirmationList.js
...AwaitingConfirmation/materialsAwaitingConfirmationList.js
+13
-0
erp-produce/src/main/resources/template/js/workshopMaterialInventory/productInventoryDetails.js
...e/js/workshopMaterialInventory/productInventoryDetails.js
+80
-0
erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js
...orkshopMaterialInventory/workshopMaterialInventoryList.js
+30
-19
erp-produce/src/main/resources/template/tpl/erpDepartStock/departmentalInventoryDetails.html
...late/tpl/erpDepartStock/departmentalInventoryDetails.html
+30
-0
erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderToPut.html
...ate/tpl/materialReturnOrder/materialReturnOrderToPut.html
+29
-0
erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/productInventoryDetails.html
...pl/workshopMaterialInventory/productInventoryDetails.html
+30
-0
erp/src/main/resources/template/js/depotPut/transList.js
erp/src/main/resources/template/js/depotPut/transList.js
+2
-2
web/src/main/resources/template/json/sysServiceMation.json
web/src/main/resources/template/json/sysServiceMation.json
+1
-1
未找到文件。
erp-produce/src/main/resources/template/js/erpDepartStock/departmentalInventoryDetails.js
0 → 100644
浏览文件 @
8266b3f5
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
materialId
=
GetUrlParam
(
"
materialId
"
);
var
normsId
=
GetUrlParam
(
"
normsId
"
);
var
departmentId
=
GetUrlParam
(
"
departmentId
"
);
//车间选择商品当前库存信息
initTable
()
function
initTable
()
{
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
sysMainMation
.
erpBasePath
+
'
queryNormsStockDetailList
'
,
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
:
'
codeNum
'
,
title
:
'
条形码
'
,
align
:
'
center
'
,
width
:
250
},
{
field
:
'
departmentMation
'
,
title
:
'
来源部门
'
,
align
:
'
left
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
departmentMation
)
?
''
:
d
.
departmentMation
.
name
}
},
{
field
:
'
depotMation
'
,
title
:
'
来源仓库
'
,
align
:
'
left
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
depotMation
)
?
''
:
d
.
depotMation
.
name
}
}
]],
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
=
{
materialId
:
materialId
,
normsId
:
normsId
,
departmentId
:
departmentId
}
return
$
.
extend
(
true
,
params
,
initTableSearchUtil
.
getSearchValue
(
"
messageTable
"
));
}
exports
(
'
departmentalInventoryDetails
'
,
{});
});
erp-produce/src/main/resources/template/js/erpDepartStock/erpDepartStockList.js
浏览文件 @
8266b3f5
...
...
@@ -25,7 +25,9 @@ layui.config({
{
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
}
{
field
:
'
stock
'
,
title
:
'
部门库存
'
,
align
:
'
center
'
,
width
:
80
,
templet
:
function
(
d
)
{
var
str
=
'
<a lay-event="inventory" class="notice-title-click">
'
+
d
.
stock
+
'
</a>
'
;
return
str
;}},
]],
done
:
function
(
json
)
{
matchingLanguage
();
...
...
@@ -35,6 +37,28 @@ layui.config({
}
});
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
inventory
'
)
{
//详情
inventory
(
data
);
}
});
// 部门商品库存详情
function
inventory
(
data
)
{
_openNewWindows
({
url
:
"
../../tpl/erpDepartStock/departmentalInventoryDetails.html?materialId=
"
+
data
.
materialId
+
"
&normsId=
"
+
data
.
normsId
+
"
&departmentId=
"
+
data
.
departmentId
,
title
:
"
部门商品库存详情
"
,
pageId
:
"
productInventoryDetails
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
...
...
erp-produce/src/main/resources/template/js/erpPick/erpReturnPickToPut.js
浏览文件 @
8266b3f5
...
...
@@ -33,8 +33,7 @@ layui.config({
}});
},
loadComponentCallback
:
function
()
{
$
(
"
select[attrkey='holderIdType']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
select[attrkey='holderIdType']
"
).
parent
().
next
().
children
(
'
i
'
).
remove
();
$
(
"
div[controlType='correspondentEnter']
"
).
remove
();
$
(
"
div[controlType='depotPutFromType']
"
).
remove
();
},
tableAddRowCallback
:
function
(
tableId
)
{
...
...
erp-produce/src/main/resources/template/js/erpPick/turnReturnMaterialToPut.js
浏览文件 @
8266b3f5
...
...
@@ -39,7 +39,7 @@ layui.config({
loadComponentCallback
:
function
()
{
$
(
"
select[attrkey='departmentId']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
select[attrkey='farmId']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='re
quisitionOutLe
tFromType']
"
).
remove
();
$
(
"
div[controlType='re
turnPu
tFromType']
"
).
remove
();
},
tableAddRowCallback
:
function
(
tableId
)
{
$
(
"
#addRow
"
+
tableId
).
remove
();
...
...
erp-produce/src/main/resources/template/js/materialReceiptForm/materialsAwaitingToReceipt.js
浏览文件 @
8266b3f5
...
...
@@ -17,38 +17,34 @@ layui.config({
// 待确认物料转物料接收
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
queryDepotOutTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
// 物料接收的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024071500004
'
,
data
,
{
savePreParams
:
function
(
params
)
{
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertDepotOutToTurnPut
"
,
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='userStaffChoose']
"
).
children
().
children
(
'
i
'
).
remove
();
$
(
"
div[controlType='userStaffChoose']
"
).
children
().
children
().
children
().
children
().
children
(
'
i
'
).
remove
();
$
(
"
div[controlType='confirmFromType']
"
).
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
'
,
'
FP2024071500004
'
,
data
,
{
savePreParams
:
function
(
params
)
{
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertDepotOutToTurnPut
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
},
loadComponentCallback
:
function
()
{
$
(
"
div[controlType='confirmFromType']
"
).
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/materialReturnOrder/materialReturnOrderList.js
浏览文件 @
8266b3f5
...
...
@@ -49,8 +49,8 @@ layui.config({
{
field
:
'
state
'
,
title
:
'
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
flowableStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
otherState
'
,
title
:
'
确认
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
depot
OutOther
State
"
,
'
id
'
,
d
.
otherState
,
'
name
'
);
{
field
:
'
otherState
'
,
title
:
'
入库
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
depot
Put
State
"
,
'
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
},
...
...
@@ -131,6 +131,11 @@ layui.config({
});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
});
function
loadTable
()
{
table
.
reloadData
(
"
messageTable
"
,
{
where
:
getTableParams
()});
}
...
...
erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderToPut.js
0 → 100644
浏览文件 @
8266b3f5
// 以下两个参数开启团队权限时有值
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
+
"
queryConfirmReturnTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
console
.
log
(
data
)
// 仓库入库的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024070100009
'
,
data
,
{
savePreParams
:
function
(
params
)
{
params
.
holderId
=
data
.
holderId
params
.
holderKey
=
data
.
holderKey
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertConfirmReturnToTurnDepot
"
,
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='correspondentEnter']
"
).
remove
();
$
(
"
div[controlType='depotPutFromType']
"
).
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/materialReturnOrder/materialsAwaitingToReturn.js
浏览文件 @
8266b3f5
...
...
@@ -30,9 +30,6 @@ layui.config({
}});
},
loadComponentCallback
:
function
()
{
$
(
"
select[attrkey='departmentId']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
select[attrkey='farmId']
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='userStaffChoose']
"
).
children
().
children
(
'
i
'
).
remove
();
$
(
"
div[controlType='confirmFromType']
"
).
remove
();
},
tableAddRowCallback
:
function
(
tableId
)
{
...
...
erp-produce/src/main/resources/template/js/materialsAwaitingConfirmation/materialsAwaitingConfirmationList.js
浏览文件 @
8266b3f5
...
...
@@ -81,6 +81,8 @@ layui.config({
materialReceipt
(
data
);
}
else
if
(
layEvent
===
'
materialReturn
'
){
// 物料退货
materialReturn
(
data
);
}
else
if
(
layEvent
===
'
details
'
)
{
//详情
details
(
data
);
}
});
...
...
@@ -111,6 +113,17 @@ layui.config({
}});
}
// 详情
function
details
(
data
)
{
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
'
FP2024070100007&id=
'
+
data
.
id
,
null
),
title
:
systemLanguage
[
"
com.skyeye.detailsPageTitle
"
][
languageType
],
pageId
:
"
materialsAwaitingConfirmationDetails
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
}});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
...
...
erp-produce/src/main/resources/template/js/workshopMaterialInventory/productInventoryDetails.js
0 → 100644
浏览文件 @
8266b3f5
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
materialId
=
GetUrlParam
(
"
materialId
"
);
var
normsId
=
GetUrlParam
(
"
normsId
"
);
var
farmId
=
GetUrlParam
(
"
farmId
"
);
//车间选择商品当前库存信息
initTable
()
function
initTable
()
{
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
sysMainMation
.
erpBasePath
+
'
queryNormsStockDetailList
'
,
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
:
'
codeNum
'
,
title
:
'
条形码
'
,
align
:
'
center
'
,
width
:
250
},
{
field
:
'
departmentMation
'
,
title
:
'
来源部门
'
,
align
:
'
left
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
departmentMation
)
?
''
:
d
.
departmentMation
.
name
}
},
{
field
:
'
depotMation
'
,
title
:
'
来源仓库
'
,
align
:
'
left
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
depotMation
)
?
''
:
d
.
depotMation
.
name
}
}
]],
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
=
{
materialId
:
materialId
,
normsId
:
normsId
,
farmId
:
farmId
}
return
$
.
extend
(
true
,
params
,
initTableSearchUtil
.
getSearchValue
(
"
messageTable
"
));
}
exports
(
'
productInventoryDetails
'
,
{});
});
erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js
浏览文件 @
8266b3f5
...
...
@@ -10,7 +10,7 @@ layui.config({
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
));
...
...
@@ -38,24 +38,13 @@ layui.config({
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
)
{
{
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
,
templet
:
function
(
d
)
{
var
str
=
'
<a lay-event="inventory" class="notice-title-click">
'
+
d
.
stock
+
'
</a>
'
;
return
str
;}},]],
done
:
function
(
json
)
{
matchingLanguage
();
initTableSearchUtil
.
initAdvancedSearch
(
this
,
json
.
searchFilter
,
form
,
"
暂不支持搜索
"
,
function
()
{
table
.
reloadData
(
"
messageTable
"
,
{
page
:
{
curr
:
1
},
where
:
getTableParams
()});
...
...
@@ -64,6 +53,28 @@ layui.config({
});
}
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
inventory
'
)
{
//详情
inventory
(
data
);
}
});
// 车间商品库存详情
function
inventory
(
data
)
{
_openNewWindows
({
url
:
"
../../tpl/workshopMaterialInventory/productInventoryDetails.html?materialId=
"
+
data
.
materialId
+
"
&normsId=
"
+
data
.
normsId
+
"
&farmId=
"
+
data
.
farmId
,
title
:
"
车间商品库存详情
"
,
pageId
:
"
productInventoryDetails
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
...
...
erp-produce/src/main/resources/template/tpl/erpDepartStock/departmentalInventoryDetails.html
0 → 100644
浏览文件 @
8266b3f5
<!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"
>
<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/erpDepartStock/
'
}).
use
(
'
departmentalInventoryDetails
'
);
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderToPut.html
0 → 100644
浏览文件 @
8266b3f5
<!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/materialReturnOrder/
'
}).
use
(
'
materialReturnOrderToPut
'
);
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/productInventoryDetails.html
0 → 100644
浏览文件 @
8266b3f5
<!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"
>
<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
(
'
productInventoryDetails
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/depotPut/transList.js
浏览文件 @
8266b3f5
...
...
@@ -94,7 +94,7 @@ layui.config({
pageUrl
=
'
FP2024070100003
'
;
}
else
if
(
type
==
6
)
{
// 物料退货单
pageUrl
=
'
FP202407
0100004
'
;
pageUrl
=
'
FP202407
1500005
'
;
}
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
pageUrl
+
'
&id=
'
+
data
.
id
,
null
),
...
...
@@ -126,7 +126,7 @@ layui.config({
pageUrl
=
'
../../tpl/erpPick/erpReturnPickToPut.html
'
;
}
else
if
(
type
==
6
)
{
// 物料退货单
pageUrl
=
''
;
pageUrl
=
'
../../tpl/materialReturnOrder/materialReturnOrderToPut.html
'
;
}
_openNewWindows
({
url
:
pageUrl
+
'
?id=
'
+
data
.
id
,
...
...
web/src/main/resources/template/json/sysServiceMation.json
浏览文件 @
8266b3f5
...
...
@@ -29,7 +29,7 @@
"pickReturn"
:
{
"name"
:
"退料单"
,
"key"
:
"com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"
},
"returnMaterialPutList"
:
{
"name"
:
"退料入库单"
,
"key"
:
"com.skyeye.pick.service.impl.ReturnPutServiceImpl"
},
"materialReceiptForm"
:
{
"name"
:
"物料接收单"
,
"key"
:
"com.skyeye.pickconfirm.service.impl.ConfirmPutServiceImpl"
},
"
returnMaterialPutList
"
:
{
"name"
:
"物料退货单"
,
"key"
:
"com.skyeye.pickconfirm.service.impl.ConfirmReturnServiceImpl"
},
"
materialReturnOrder
"
:
{
"name"
:
"物料退货单"
,
"key"
:
"com.skyeye.pickconfirm.service.impl.ConfirmReturnServiceImpl"
},
"proworkLoad"
:
{
"name"
:
"项目工作量审核"
,
"key"
:
"com.skyeye.service.impl.ProWorkloadServiceImpl"
},
"proTask"
:
{
"name"
:
"项目任务审核"
,
"key"
:
"com.skyeye.service.impl.ProTaskServiceImpl"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录