From 4de8ff6f4d2e0658ac03296d6925f206c2faefcb Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 21 Jan 2025 00:46:16 +0800 Subject: [PATCH] md --- .../emis/EmisWaybillOperLogController.java | 134 ++++++++++++++ .../erp/emis/domain/EmisWaybillOperLog.java | 64 +++++++ .../domain/enumtype/WaybillOperLogType.java | 30 +++ .../emis/mapper/EmisWaybillOperLogMapper.java | 80 ++++++++ .../erp/emis/service/EmisBaseService.java | 68 ++++--- .../service/IEmisWaybillOperLogService.java | 78 ++++++++ .../impl/EmisWaybillOperLogServiceImpl.java | 117 ++++++++++++ .../service/impl/EmisWaybillServiceImpl.java | 20 +- .../mapper/EmisWaybillOperLogMapper.xml | 174 ++++++++++++++++++ 9 files changed, 740 insertions(+), 25 deletions(-) create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillOperLogController.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOperLog.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOperLogMapper.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillOperLogService.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java create mode 100644 emis-biz/src/main/resources/mapper/EmisWaybillOperLogMapper.xml diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillOperLogController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillOperLogController.java new file mode 100644 index 000000000..3a9511a04 --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillOperLogController.java @@ -0,0 +1,134 @@ + +/** + * @Project: emis + * @Title: EmisWaybillOperLogController.java + * @author linfso + * @date 2025-01-20 15:55:57 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

运单操作日志 控制器

+ */ + +package com.xdadan.erp.web.emis; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.xdadan.erp.common.annotation.Log; +import com.xdadan.erp.common.core.controller.BaseController; +import com.xdadan.erp.common.core.domain.AjaxResult; +import com.xdadan.erp.common.core.page.TableDataInfo; +import com.xdadan.erp.common.enums.BusinessType; +import com.xdadan.erp.common.utils.StringUtils; +import com.xdadan.erp.common.utils.poi.ExcelUtil; + +import com.xdadan.erp.emis.domain.EmisWaybillOperLog; +import com.xdadan.erp.emis.service.IEmisWaybillOperLogService; + +/** + * 运单操作日志Controller + * + * @author linfso + * @date 2025-01-20 15:55:57 + */ +@RestController +@RequestMapping("/emis/emisWaybillOperLog") +public class EmisWaybillOperLogController extends BaseController +{ + @Autowired + private IEmisWaybillOperLogService emisWaybillOperLogService; + + /** + * 查询运单操作日志列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWaybillOperLog:list')") + @GetMapping("/list") + public TableDataInfo list(EmisWaybillOperLog emisWaybillOperLog) + { + startPage(); + List list = emisWaybillOperLogService.selectEmisWaybillOperLogList(emisWaybillOperLog); + return getDataTable(list); + } + + + /** + * 检查是否重复 + * + * @param emisWaybillOperLog + * @return 数量 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWaybillOperLog:list')") + @GetMapping("/checkUnique") + public AjaxResult checkUnique(EmisWaybillOperLog emisWaybillOperLog) + { + int cnt=emisWaybillOperLogService.checkUnique(emisWaybillOperLog); + return AjaxResult.success("检查成功",cnt); + } + + + /** + * 导出运单操作日志列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWaybillOperLog:export')") + @Log(title = "运单操作日志", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmisWaybillOperLog emisWaybillOperLog) + { + List list = emisWaybillOperLogService.selectEmisWaybillOperLogList(emisWaybillOperLog); + ExcelUtil util = new ExcelUtil(EmisWaybillOperLog.class); + util.exportExcel(response, list, "运单操作日志数据"); + } + + /** + * 获取运单操作日志详细信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWaybillOperLog:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(emisWaybillOperLogService.selectEmisWaybillOperLogById(id)); + } + + /** + * 新增运单操作日志 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWaybillOperLog:add')") + @Log(title = "运单操作日志", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmisWaybillOperLog emisWaybillOperLog) + { + return toAjax(emisWaybillOperLogService.insertEmisWaybillOperLog(emisWaybillOperLog)); + } + + /** + * 修改运单操作日志 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWaybillOperLog:edit')") + @Log(title = "运单操作日志", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmisWaybillOperLog emisWaybillOperLog) + { + return toAjax(emisWaybillOperLogService.updateEmisWaybillOperLog(emisWaybillOperLog)); + } + + /** + * 删除运单操作日志 + */ + @PreAuthorize("@ss.hasPermi('emis:emisWaybillOperLog:remove')") + @Log(title = "运单操作日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(emisWaybillOperLogService.deleteEmisWaybillOperLogByIds(ids)); + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOperLog.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOperLog.java new file mode 100644 index 000000000..3fa223193 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOperLog.java @@ -0,0 +1,64 @@ +/** + * @Project: emis + * @Title: EmisWaybillOperLog.java + * @author linfso + * @date 2025-01-20 15:55:57 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

运单操作日志 实体类

+ */ + +package com.xdadan.erp.emis.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.xdadan.erp.common.annotation.Excel; +import com.xdadan.erp.common.core.domain.BaseEntity; +import com.xdadan.erp.common.core.domain.TreeEntity; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + + +/** + * @ClassName EmisWaybillOperLog + * @Description 运单操作日志 + * @author linfso + * @date 2025-01-20 15:55:57 + */ + @Data +public class EmisWaybillOperLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + /* 实际运单号 */ + private String billCode; + /* 订单号 */ + private String orderSn; + /* 主单号 */ + private String mainBillCode; + /* 是否子单 1-是 0-否 */ + private String blSubBill; + /* 操作类型 1-下单 2-开单等 */ + private String opType; + /* 操作时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date opDate; + /* 操作人 */ + private String opManCode; + /* 操作名 */ + private String opMan; + /* 操作站点 */ + private String opSiteCode; + /* 操作站点名称 */ + private String opSiteName; + /* 操作日志信息 */ + private String opDesc; + /* 数据来源 pc,app,sapp */ + private String dataFrom; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java new file mode 100644 index 000000000..d67897e9f --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillOperLogType.java @@ -0,0 +1,30 @@ +package com.xdadan.erp.emis.domain.enumtype; + +/** + * 运单操作日志 + * waybill operate log type + */ +public enum WaybillOperLogType { + + CUST_CREATE_ORDER("1","客户下单"), + + SITE_GOT("2","开单"), + SITE_MODIFY("3","改单"), + SITE_DEPARTURE("4","发件"), + SITE_ARRIVAL("5","到件"), + SITE_SENT("6","派送"), + CUST_SIGNED("7","签收"), + + OTHER("99","其他"), + + + ; + + public String opType; + public String opName; + + WaybillOperLogType(String opType, String opName) { + this.opType = opType; + this.opName = opName; + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOperLogMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOperLogMapper.java new file mode 100644 index 000000000..25c0c0371 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOperLogMapper.java @@ -0,0 +1,80 @@ +/** + * @Project: emis + * @Title: EmisWaybillOperLogMapper.java + * @author linfso + * @date 2025-01-20 15:55:57 + * @Copyright: ShangHai Doitinfo 2022 All rights reserved. + * @version v1.0 + * @Description:

运单操作日志 Mapper 接口

+ * Warning : This file is generate by ai tools,don't edit!!! + */ +package com.xdadan.erp.emis.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xdadan.erp.emis.domain.EmisWaybillOperLog; +/** + * @ClassName EmisWaybillOperLogMapper + * @Description

运单操作日志 Mapper 接口

+ * @author linfso + * @date 2025-01-20 15:55:57 + */ +public interface EmisWaybillOperLogMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisWaybillOperLog selectEmisWaybillOperLogById(Long id); + + /** + * 查询列表 + * + * @param emisWaybillOperLog + * @return 集合 + */ + public List selectEmisWaybillOperLogList(EmisWaybillOperLog emisWaybillOperLog); + + + /** + * 检查是否重复 + * + * @param emisWaybillOperLog + * @return 数量 + */ + public int checkUnique(EmisWaybillOperLog emisWaybillOperLog); + + + /** + * 新增 + * + * @param emisWaybillOperLog + * @return + */ + public int insertEmisWaybillOperLog(EmisWaybillOperLog emisWaybillOperLog); + + /** + * 修改 + * + * @param emisWaybillOperLog + * @return + */ + public int updateEmisWaybillOperLog(EmisWaybillOperLog emisWaybillOperLog); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + public int deleteEmisWaybillOperLogById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmisWaybillOperLogByIds(Long[] ids); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index cd3757e2d..2cc856799 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -11,62 +11,38 @@ package com.xdadan.erp.emis.service; import cn.hutool.core.collection.CollectionUtil; - import cn.hutool.core.lang.Snowflake; - import cn.hutool.core.util.IdUtil; - import cn.hutool.db.DbUtil; import com.alibaba.fastjson.JSON; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; - import com.alibaba.fastjson.serializer.PropertyFilter; - import com.alibaba.fastjson.serializer.SerializeFilter; - import com.alibaba.fastjson.serializer.SerializerFeature; - import com.alibaba.fastjson.serializer.ValueFilter; - import com.fasterxml.jackson.annotation.JsonFormat; - import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.domain.entity.SysUser; - import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.core.redis.RedissonService; import com.xdadan.erp.common.utils.*; - import com.xdadan.erp.common.utils.sign.MD5; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.*; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.ScanStatInfoDtl; - import com.xdadan.erp.emis.domain.vo.WaybillOrder; - import com.xdadan.erp.emis.domain.vo.scan.ScanResultItem; import com.xdadan.erp.emis.mapper.*; - import com.xdadan.erp.emis.service.IEmisWaybillAttachmentService; - import com.xdadan.erp.emis.service.IEmisWaybillCargoService; - import com.xdadan.erp.emis.service.IEmisWaybillFeeitemService; - import com.xdadan.erp.emis.service.IEmisWaybillService; import com.xdadan.erp.emis.service.sms.AliyunSMSService; - import com.xdadan.erp.emis.service.sms.CMCCSMSService; import com.xdadan.erp.emis.service.sms.Sms253Service; - import com.xdadan.erp.emis.utils.HTTPHelperV3; import com.xdadan.erp.emis.utils.Kd100Helper; import com.xdadan.erp.emis.utils.Q17trackHelper; import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.emis.utils.sensitive.Convert; - import com.xdadan.erp.framework.manager.NoticManager; import com.xdadan.erp.system.domain.SysPost; import com.xdadan.erp.system.mapper.SysPostMapper; import com.xdadan.erp.system.mapper.SysUserMapper; import com.xdadan.erp.system.service.ISysConfigService; import com.xdadan.erp.system.service.ISysNoticeService; import com.xdadan.erp.system.service.ISysUserService; - import jdk.nashorn.internal.runtime.Undefined; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.WordUtils; - import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; - import java.text.SimpleDateFormat; import java.util.*; /** @@ -178,6 +154,10 @@ public class EmisBaseService { emptySysUser.setOwnerSiteCode("0"); } + @Autowired + private EmisWaybillOperLogMapper emisWaybillOperLogMapper; + + // @Autowired // private CMCCSMSService cmccSMSService; @@ -224,6 +204,46 @@ public class EmisBaseService { return emisExchangeRateMapper.getValidExchangeRate(from, to,rateDate); } + + + /** + * 录入运单操作日志 + * @param billCode + * @param operLogType + * @param operManName + * @param operSiteName + * @param operDesc + */ + public void recordWaybillOperLog( + String billCode, + WaybillOperLogType operLogType, + String operManName, + String operSiteName, + String operDesc + ){ + + try { + String mainBillCode = getMainBillCode(billCode); + + // 插入数据 + EmisWaybillOperLog waybillOperLog = new EmisWaybillOperLog(); + waybillOperLog.setBillCode(billCode); + waybillOperLog.setMainBillCode(mainBillCode); + if (!billCode.equals(mainBillCode)) { + waybillOperLog.setBlSubBill("1"); + } + waybillOperLog.setOpMan(operManName); + waybillOperLog.setOpSiteName(operSiteName); + waybillOperLog.setOpType(operLogType.opType); + waybillOperLog.setOpDesc(operDesc); + waybillOperLog.setOpDate(new Date()); + + emisWaybillOperLogMapper.insertEmisWaybillOperLog(waybillOperLog); + }catch (Exception ex){ + ex.printStackTrace(); + } + } + /** * 判断获取主单号 * @param billCode diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillOperLogService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillOperLogService.java new file mode 100644 index 000000000..14931f437 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillOperLogService.java @@ -0,0 +1,78 @@ + /** + * @Project: emis + * @Title: EmisWaybillOperLogService.java + * @author linfso + * @date 2025-01-20 15:55:57 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

运单操作日志 服务类接口

+ */ +package com.xdadan.erp.emis.service; + +import java.util.List; +import com.xdadan.erp.emis.domain.EmisWaybillOperLog; + +/** + * @ClassName EmisWaybillOperLogService + * @Description 运单操作日志 + * @author linfso + * @date 2025-01-20 15:55:57 + */ +public interface IEmisWaybillOperLogService +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisWaybillOperLog selectEmisWaybillOperLogById(Long id); + + /** + * 查询运单操作日志列表 + * + * @param emisWaybillOperLog 运单操作日志 + * @return 运单操作日志集合 + */ + public List selectEmisWaybillOperLogList(EmisWaybillOperLog emisWaybillOperLog); + + + /** + * 检查是否重复 + * + * @param emisWaybillOperLog + * @return 数量 + */ + public int checkUnique(EmisWaybillOperLog emisWaybillOperLog); + + /** + * 新增运单操作日志 + * + * @param emisWaybillOperLog 运单操作日志 + * @return 结果 + */ + public int insertEmisWaybillOperLog(EmisWaybillOperLog emisWaybillOperLog); + + /** + * 修改运单操作日志 + * + * @param emisWaybillOperLog 运单操作日志 + * @return 结果 + */ + public int updateEmisWaybillOperLog(EmisWaybillOperLog emisWaybillOperLog); + + /** + * 批量删除运单操作日志 + * + * @param ids 需要删除的运单操作日志主键集合 + * @return 结果 + */ + public int deleteEmisWaybillOperLogByIds(Long[] ids); + + /** + * 删除运单操作日志信息 + * + * @param id 运单操作日志主键 + * @return 结果 + */ + public int deleteEmisWaybillOperLogById(Long id); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java new file mode 100644 index 000000000..5c70337e8 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java @@ -0,0 +1,117 @@ + /** + * @Project: emis + * @Title: EmisWaybillOperLogServiceImpl.java + * @author linfso + * @date 2025-01-20 15:55:57 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

运单操作日志 实体类

+ */ + +package com.xdadan.erp.emis.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.xdadan.erp.emis.domain.EmisWaybillOperLog; +import com.xdadan.erp.emis.mapper.EmisWaybillOperLogMapper; +import com.xdadan.erp.emis.service.IEmisWaybillOperLogService; + +/** + * 运单操作日志Service业务层处理 + * + * @author linfso + * @date 2025-01-20 15:55:57 + */ +@Service +public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService +{ + @Autowired + private EmisWaybillOperLogMapper emisWaybillOperLogMapper; + + /** + * 查询运单操作日志 + * + * @param id 运单操作日志主键 + * @return 运单操作日志 + */ + @Override + public EmisWaybillOperLog selectEmisWaybillOperLogById(Long id) + { + return emisWaybillOperLogMapper.selectEmisWaybillOperLogById(id); + } + + + /** + * 查询运单操作日志列表 + * + * @param emisWaybillOperLog 运单操作日志 + * @return 运单操作日志 + */ + @Override + public List selectEmisWaybillOperLogList(EmisWaybillOperLog emisWaybillOperLog) + { + return emisWaybillOperLogMapper.selectEmisWaybillOperLogList(emisWaybillOperLog); + } + + /** + * 检查是否重复 + * + * @param emisWaybillOperLog + * @return 数量 + */ + @Override + public int checkUnique(EmisWaybillOperLog emisWaybillOperLog) + { + return emisWaybillOperLogMapper.checkUnique(emisWaybillOperLog); + } + + /** + * 新增运单操作日志 + * + * @param emisWaybillOperLog 运单操作日志 + * @return 结果 + */ + @Override + public int insertEmisWaybillOperLog(EmisWaybillOperLog emisWaybillOperLog) + { + return emisWaybillOperLogMapper.insertEmisWaybillOperLog(emisWaybillOperLog); + } + + /** + * 修改运单操作日志 + * + * @param emisWaybillOperLog 运单操作日志 + * @return 结果 + */ + @Override + public int updateEmisWaybillOperLog(EmisWaybillOperLog emisWaybillOperLog) + { + return emisWaybillOperLogMapper.updateEmisWaybillOperLog(emisWaybillOperLog); + } + + /** + * 批量删除运单操作日志 + * + * @param ids 需要删除的运单操作日志主键 + * @return 结果 + */ + @Override + public int deleteEmisWaybillOperLogByIds(Long[] ids) + { + return emisWaybillOperLogMapper.deleteEmisWaybillOperLogByIds(ids); + } + + /** + * 删除运单操作日志信息 + * + * @param id 运单操作日志主键 + * @return 结果 + */ + @Override + public int deleteEmisWaybillOperLogById(Long id) + { + return emisWaybillOperLogMapper.deleteEmisWaybillOperLogById(id); + } + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index a3d382303..7f19a94af 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -2973,9 +2973,18 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillSave.setGoodsPics("1"); } - //补齐数据 + //插入新单 emisWaybillMapper.insertEmisWaybill(emisWaybillSave); + // 运单日志记录 + recordWaybillOperLog( + emisWaybillSave.getBillCode(), + WaybillOperLogType.SITE_GOT, + getCurrentUser().getEmpName(), + getCurrentUser().getOwnerSiteName(), + "网点揽收开单,网点:【"+getCurrentUser().getOwnerSiteName()+"】,录入人:【"+getCurrentUser().getEmpName()+"】" + ); + // 绑定专属业务员 String bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode(); if(StringUtils.isEmpty(bindEmpCode)){ @@ -3163,6 +3172,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 插入运单数据 emisWaybillMapper.insertEmisWaybill(emisWaybillSave); + // 运单日志记录 + recordWaybillOperLog( + emisWaybillSave.getBillCode(), + WaybillOperLogType.CUST_CREATE_ORDER, + emisWaybillSave.getCustomerName(), + null, + "客户下单" + ); + // 产生主键插入其他数据 // 插入费用 List feeitemList=emisWaybillSave.getFeeitemList(); diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillOperLogMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillOperLogMapper.xml new file mode 100644 index 000000000..8f03f8e6b --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisWaybillOperLogMapper.xml @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + select id, bill_code, order_sn, main_bill_code, bl_sub_bill, op_type, op_date, op_man_code, op_man, op_site_code, op_site_name, op_desc, data_from, del_flag, remark, create_by, create_time, update_by, update_time, update_site, create_site from emis_waybill_oper_log + + + + + + + + + + insert into emis_waybill_oper_log + + bill_code, + order_sn, + main_bill_code, + bl_sub_bill, + op_type, + op_date, + op_man_code, + op_man, + op_site_code, + op_site_name, + op_desc, + data_from, + del_flag, + remark, + create_by, + create_time, + update_by, + update_time, + update_site, + create_site, + + + #{billCode}, + #{orderSn}, + #{mainBillCode}, + #{blSubBill}, + #{opType}, + #{opDate}, + #{opManCode}, + #{opMan}, + #{opSiteCode}, + #{opSiteName}, + #{opDesc}, + #{dataFrom}, + #{delFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{updateSite}, + #{createSite}, + + + + + update emis_waybill_oper_log + + bill_code = #{billCode}, + order_sn = #{orderSn}, + main_bill_code = #{mainBillCode}, + bl_sub_bill = #{blSubBill}, + op_type = #{opType}, + op_date = #{opDate}, + op_man_code = #{opManCode}, + op_man = #{opMan}, + op_site_code = #{opSiteCode}, + op_site_name = #{opSiteName}, + op_desc = #{opDesc}, + data_from = #{dataFrom}, + del_flag = #{delFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + update_site = #{updateSite}, + create_site = #{createSite}, + + where id = #{id} + + + + delete from emis_waybill_oper_log where id = #{id} + + + + delete from emis_waybill_oper_log where id in + + #{id} + + + \ No newline at end of file