Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ximai
mes
Commits
83d11194
Commit
83d11194
authored
Nov 13, 2024
by
李驰骋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工单物料同步日志添加
parent
ae0a1b85
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
5 deletions
+20
-5
ApiLog.java
common/src/main/java/com/ximai/common/annotation/ApiLog.java
+1
-1
InOutType.java
common/src/main/java/com/ximai/common/enums/InOutType.java
+4
-4
MdItemServiceImpl.java
...java/com/ximai/mes/md/service/impl/MdItemServiceImpl.java
+7
-0
ProWorkorderServiceImpl.java
...ro/service/impl/proWorkOrder/ProWorkorderServiceImpl.java
+8
-0
No files found.
common/src/main/java/com/ximai/common/annotation/ApiLog.java
View file @
83d11194
...
...
@@ -34,7 +34,7 @@ public @interface ApiLog
/**
* 调入、调出
*/
public
InOutType
inOutType
()
default
InOutType
.
IN
;
public
InOutType
inOutType
()
default
InOutType
.
IN
NER
;
/**
* 是否保存请求的参数
...
...
common/src/main/java/com/ximai/common/enums/InOutType.java
View file @
83d11194
package
com
.
ximai
.
common
.
enums
;
/**
*
操作人类别
*
内部/外部接口调用
*
*/
public
enum
InOutType
{
/**
*
其它
*
内部调用
*/
IN
,
IN
NER
,
/**
*
后台用户
*
外部接口调用
*/
OUT
,
...
...
mes/src/main/java/com/ximai/mes/md/service/impl/MdItemServiceImpl.java
View file @
83d11194
...
...
@@ -8,10 +8,13 @@ import cn.hutool.json.JSONArray;
import
cn.hutool.json.JSONObject
;
import
cn.hutool.json.JSONUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.ximai.common.annotation.ApiLog
;
import
com.ximai.common.constant.UserConstants
;
import
com.ximai.common.core.domain.SapResult
;
import
com.ximai.common.core.domain.entity.MdItemType
;
import
com.ximai.common.core.domain.entity.SysDictData
;
import
com.ximai.common.enums.BusinessType
;
import
com.ximai.common.enums.InOutType
;
import
com.ximai.common.exception.ServiceException
;
import
com.ximai.common.utils.MessageUtils
;
import
com.ximai.common.utils.SecurityUtils
;
...
...
@@ -39,6 +42,7 @@ import com.ximai.mes.remote.ErpService;
import
com.ximai.mes.remote.dto.*
;
import
com.ximai.system.service.ISysDictDataService
;
import
com.ximai.system.strategy.AutoCodeUtil
;
import
io.swagger.annotations.ApiOperation
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -540,6 +544,9 @@ public class MdItemServiceImpl implements IMdItemService {
this
.
syncEditErpData
();
}
}
@ApiLog
(
businessType
=
BusinessType
.
SYNC_DATA
,
inOutType
=
InOutType
.
INNER
)
@ApiOperation
(
value
=
"物料同步"
)
@Transactional
@Override
public
void
syncEditErpData
(
MdItemErpDto
s
,
Map
<
Long
,
MdItemType
>
itemTypeMap
)
{
...
...
mes/src/main/java/com/ximai/mes/pro/service/impl/proWorkOrder/ProWorkorderServiceImpl.java
View file @
83d11194
...
...
@@ -11,8 +11,11 @@ import cn.hutool.poi.excel.ExcelUtil;
import
cn.hutool.poi.excel.ExcelWriter
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.github.pagehelper.PageHelper
;
import
com.ximai.common.annotation.ApiLog
;
import
com.ximai.common.constant.UserConstants
;
import
com.ximai.common.core.domain.entity.SysUser
;
import
com.ximai.common.enums.BusinessType
;
import
com.ximai.common.enums.InOutType
;
import
com.ximai.common.exception.ServiceException
;
import
com.ximai.common.utils.MessageUtils
;
import
com.ximai.common.utils.SecurityUtils
;
...
...
@@ -64,6 +67,7 @@ import com.ximai.mes.wm.mapper.WmIssueLineMapper;
import
com.ximai.system.service.ISysDictDataService
;
import
com.ximai.system.service.ISysUserService
;
import
com.ximai.system.strategy.AutoCodeUtil
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -1061,6 +1065,7 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
* @param proWorkorder 生产工单
* @return 结果
*/
@Override
public
int
insertProWorkorder
(
ProWorkorder
proWorkorder
)
{
if
(
proWorkorder
.
getParentId
()
!=
null
)
{
...
...
@@ -1768,6 +1773,9 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
this
.
syncEditErpData
();
}
}
@ApiLog
(
businessType
=
BusinessType
.
SYNC_DATA
,
inOutType
=
InOutType
.
INNER
)
@ApiOperation
(
value
=
"工单同步"
)
@Transactional
@Override
public
void
syncEditErpData
(
ProWorkorderErpDto
s
,
Map
<
String
,
MdItem
>
itemMap
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment