Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
b014d93c
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1412
Star
161
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看板
提交
b014d93c
编写于
7月 08, 2024
作者:
L
LAPTOP-UV1MNL38\18023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat:采购入库转仓库入库
上级
0d478c99
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
254 addition
and
4 deletion
+254
-4
erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js
...c/main/resources/template/js/erpPick/erpPatchPickToOut.js
+54
-0
erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js
...ce/src/main/resources/template/js/erpPick/erpPickToOut.js
+54
-0
erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html
...ain/resources/template/tpl/erpPick/erpPatchPickToOut.html
+29
-0
erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html
...src/main/resources/template/tpl/erpPick/erpPickToOut.html
+29
-0
erp/src/main/resources/template/js/depotOut/transList.js
erp/src/main/resources/template/js/depotOut/transList.js
+2
-2
erp/src/main/resources/template/js/depotPut/list.js
erp/src/main/resources/template/js/depotPut/list.js
+4
-1
erp/src/main/resources/template/js/depotPut/transList.js
erp/src/main/resources/template/js/depotPut/transList.js
+1
-1
erp/src/main/resources/template/js/purchasePut/purchasePutToPut.js
...ain/resources/template/js/purchasePut/purchasePutToPut.js
+52
-0
erp/src/main/resources/template/tpl/purchasePut/purchasePutToPut.html
.../resources/template/tpl/purchasePut/purchasePutToPut.html
+29
-0
未找到文件。
erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js
0 → 100644
浏览文件 @
b014d93c
// 以下两个参数开启团队权限时有值
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
+
"
queryPatchOutLetTransById
"
,
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
+
"
insertPatchOutLetToTurnDepot
"
,
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/erpPickToOut.js
0 → 100644
浏览文件 @
b014d93c
// 以下两个参数开启团队权限时有值
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
+
"
queryRequisitionOutLetList
"
,
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
);
}
});
}});
});
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html
0 → 100644
浏览文件 @
b014d93c
<!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
(
'
erpPatchPickToOut
'
);
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html
0 → 100644
浏览文件 @
b014d93c
<!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
(
'
erpPickToOut
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/depotOut/transList.js
浏览文件 @
b014d93c
...
...
@@ -123,10 +123,10 @@ layui.config({
pageUrl
=
'
../../tpl/otherOutlets/otherOutletsToOut.html
'
;
}
else
if
(
type
==
5
)
{
// 领料出库单
pageUrl
=
''
;
pageUrl
=
'
../../tpl/erpPick/erpPickToOut.html
'
;
}
else
if
(
type
==
6
)
{
// 补料出库单
pageUrl
=
''
;
pageUrl
=
'
../../tpl/erpPick/erpPatchPickToOut.html
'
;
}
_openNewWindows
({
url
:
pageUrl
+
'
?id=
'
+
data
.
id
,
...
...
erp/src/main/resources/template/js/depotPut/list.js
浏览文件 @
b014d93c
...
...
@@ -32,12 +32,15 @@ layui.config({
return
str
;
}},
{
field
:
'
idKey
'
,
title
:
'
单据类型
'
,
width
:
120
,
templet
:
function
(
d
)
{
return
idKeyMap
[
d
.
idKey
]
;
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
depotPutFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
)
;
}},
{
field
:
'
createName
'
,
title
:
'
申请人
'
,
width
:
120
},
{
field
:
'
createTime
'
,
title
:
'
申请时间
'
,
align
:
'
center
'
,
width
:
150
},
{
field
:
'
totalPrice
'
,
title
:
'
合计金额
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
operTime
'
,
title
:
'
单据日期
'
,
align
:
'
center
'
,
width
:
140
},
{
field
:
'
state
'
,
title
:
'
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
erpOrderStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
otherState
'
,
title
:
'
入库状态
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
depotPutState
"
,
'
id
'
,
d
.
otherState
,
'
name
'
);
}},
...
...
erp/src/main/resources/template/js/depotPut/transList.js
浏览文件 @
b014d93c
...
...
@@ -111,7 +111,7 @@ layui.config({
let
type
=
idKeyToIdMap
[
data
.
idKey
];
if
(
type
==
1
)
{
// 采购入库单
pageUrl
=
''
;
pageUrl
=
'
../../tpl/purchasePut/purchasePutToPut.html
'
;
}
else
if
(
type
==
2
)
{
// 销售退货单
pageUrl
=
''
;
...
...
erp/src/main/resources/template/js/purchasePut/purchasePutToPut.js
0 → 100644
浏览文件 @
b014d93c
// 以下两个参数开启团队权限时有值
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
+
"
queryPurchasePutTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
// 仓库入库的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024070100009
'
,
data
,
{
savePreParams
:
function
(
params
)
{
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertPurchasePutToTurnDepot
"
,
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='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/src/main/resources/template/tpl/purchasePut/purchasePutToPut.html
0 → 100644
浏览文件 @
b014d93c
<!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/purchasePut/
'
}).
use
(
'
purchasePutToPut
'
);
</script>
</body>
</html>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录