diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java index 325fc6e98..fcccc579e 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java @@ -230,6 +230,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl ids,Long organizationId) { LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人 + String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId); try { for (Long id:ids){ BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id); @@ -283,6 +284,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl ids,Long organizationId) { LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人 + String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId); for (Long id:ids){ ExecuteOrder executeOrder=executeOrderMapper.selectById(id); if (ObjectUtil.isNotNull(executeOrder)){ @@ -128,6 +129,7 @@ public class ExecuteOrderImpl extends ServiceImpl businessDocumentCargoMultiList; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java index 48d26f903..f4c0ace26 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java @@ -141,4 +141,7 @@ public class ExecuteOrderDO extends BaseVOEntity{ @ApiModelProperty("备注") private String shippingNote; + + @ApiModelProperty("业务单元") + private String businessUnit; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java index b237cabd0..d7577a2c4 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java @@ -134,4 +134,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{ @ApiModelProperty("预计出发日期") private Date layDate; + + @ApiModelProperty("业务单元") + private String businessUnit; } diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml index bb2ef2c36..7f3759e00 100644 --- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml @@ -72,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and GOODS_NUMBER like concat('%', #{goodsNumber}, '%') + + and BUSINESS_UNIT like concat('%', #{businessUnit}, '%') + and ORG_NAME like concat('%', #{orgName}, '%')