Commit 83d11194 authored by 李驰骋's avatar 李驰骋

工单物料同步日志添加

parent ae0a1b85
...@@ -34,7 +34,7 @@ public @interface ApiLog ...@@ -34,7 +34,7 @@ public @interface ApiLog
/** /**
* 调入、调出 * 调入、调出
*/ */
public InOutType inOutType() default InOutType.IN; public InOutType inOutType() default InOutType.INNER;
/** /**
* 是否保存请求的参数 * 是否保存请求的参数
......
package com.ximai.common.enums; package com.ximai.common.enums;
/** /**
* 操作人类别 * 内部/外部接口调用
* *
*/ */
public enum InOutType public enum InOutType
{ {
/** /**
* 其它 * 内部调用
*/ */
IN, INNER,
/** /**
* 后台用户 * 外部接口调用
*/ */
OUT, OUT,
......
...@@ -8,10 +8,13 @@ import cn.hutool.json.JSONArray; ...@@ -8,10 +8,13 @@ import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ximai.common.annotation.ApiLog;
import com.ximai.common.constant.UserConstants; import com.ximai.common.constant.UserConstants;
import com.ximai.common.core.domain.SapResult; import com.ximai.common.core.domain.SapResult;
import com.ximai.common.core.domain.entity.MdItemType; import com.ximai.common.core.domain.entity.MdItemType;
import com.ximai.common.core.domain.entity.SysDictData; 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.exception.ServiceException;
import com.ximai.common.utils.MessageUtils; import com.ximai.common.utils.MessageUtils;
import com.ximai.common.utils.SecurityUtils; import com.ximai.common.utils.SecurityUtils;
...@@ -39,6 +42,7 @@ import com.ximai.mes.remote.ErpService; ...@@ -39,6 +42,7 @@ import com.ximai.mes.remote.ErpService;
import com.ximai.mes.remote.dto.*; import com.ximai.mes.remote.dto.*;
import com.ximai.system.service.ISysDictDataService; import com.ximai.system.service.ISysDictDataService;
import com.ximai.system.strategy.AutoCodeUtil; import com.ximai.system.strategy.AutoCodeUtil;
import io.swagger.annotations.ApiOperation;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -540,6 +544,9 @@ public class MdItemServiceImpl implements IMdItemService { ...@@ -540,6 +544,9 @@ public class MdItemServiceImpl implements IMdItemService {
this.syncEditErpData(); this.syncEditErpData();
} }
} }
@ApiLog(businessType = BusinessType.SYNC_DATA, inOutType = InOutType.INNER)
@ApiOperation(value = "物料同步")
@Transactional @Transactional
@Override @Override
public void syncEditErpData(MdItemErpDto s, Map<Long, MdItemType> itemTypeMap) { public void syncEditErpData(MdItemErpDto s, Map<Long, MdItemType> itemTypeMap) {
......
...@@ -11,8 +11,11 @@ import cn.hutool.poi.excel.ExcelUtil; ...@@ -11,8 +11,11 @@ import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter; import cn.hutool.poi.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.ximai.common.annotation.ApiLog;
import com.ximai.common.constant.UserConstants; import com.ximai.common.constant.UserConstants;
import com.ximai.common.core.domain.entity.SysUser; 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.exception.ServiceException;
import com.ximai.common.utils.MessageUtils; import com.ximai.common.utils.MessageUtils;
import com.ximai.common.utils.SecurityUtils; import com.ximai.common.utils.SecurityUtils;
...@@ -64,6 +67,7 @@ import com.ximai.mes.wm.mapper.WmIssueLineMapper; ...@@ -64,6 +67,7 @@ import com.ximai.mes.wm.mapper.WmIssueLineMapper;
import com.ximai.system.service.ISysDictDataService; import com.ximai.system.service.ISysDictDataService;
import com.ximai.system.service.ISysUserService; import com.ximai.system.service.ISysUserService;
import com.ximai.system.strategy.AutoCodeUtil; import com.ximai.system.strategy.AutoCodeUtil;
import io.swagger.annotations.ApiOperation;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -1061,6 +1065,7 @@ public class ProWorkorderServiceImpl implements IProWorkorderService { ...@@ -1061,6 +1065,7 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
* @param proWorkorder 生产工单 * @param proWorkorder 生产工单
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertProWorkorder(ProWorkorder proWorkorder) { public int insertProWorkorder(ProWorkorder proWorkorder) {
if (proWorkorder.getParentId() != null) { if (proWorkorder.getParentId() != null) {
...@@ -1768,6 +1773,9 @@ public class ProWorkorderServiceImpl implements IProWorkorderService { ...@@ -1768,6 +1773,9 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
this.syncEditErpData(); this.syncEditErpData();
} }
} }
@ApiLog(businessType = BusinessType.SYNC_DATA, inOutType = InOutType.INNER)
@ApiOperation(value = "工单同步")
@Transactional @Transactional
@Override @Override
public void syncEditErpData(ProWorkorderErpDto s, Map<String,MdItem> itemMap) { public void syncEditErpData(ProWorkorderErpDto s, Map<String,MdItem> itemMap) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment