Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/auth/AuthUserController.java

@@ -87,6 +87,7 @@ public class AuthUserController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/admin/auth/admin/selectNotSelectUser")
     public BaseResponse selectNotSelectUser(FilterInvLinkDataRequest filterInvLinkDataRequest) {
+        filterInvLinkDataRequest.setKey("1");
         List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
         List<Long> userIds = new ArrayList<>();
         warehouseUserEntities.forEach(user -> {

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -396,8 +396,20 @@ public class InvWarehouseController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
-        PageInfo<WarehouseUserEntity> pageInfo = new PageInfo<>(warehouseUserEntities);
+        filterInvLinkDataRequest.setUserName(filterInvLinkDataRequest.getKey());
+        List<WarehouseUserEntity> warehouseUserList = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
+        filterInvLinkDataRequest.setUserName(null);
+        filterInvLinkDataRequest.setEmployeeName(filterInvLinkDataRequest.getKey());
+        List<WarehouseUserEntity> warehouseUserList1 = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
+        PageInfo<WarehouseUserEntity> pageInfo=null;
+        if(warehouseUserList.size()!=0){
+            pageInfo= new PageInfo<>(warehouseUserList);
+        }else if(warehouseUserList1.size()!=0){
+           pageInfo = new PageInfo<>(warehouseUserList1);
+        }else{
+            pageInfo = new PageInfo<>(warehouseUserList);
+        }
+
 
         List<WarehouseUserResponse> result = new ArrayList<>();
         if (CollUtil.isNotEmpty(pageInfo.getList())) {

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -14,6 +14,7 @@ import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.AddOrderRequest;
 import com.glxp.api.req.inout.FilterOrderRequest;
+import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
@@ -119,4 +120,16 @@ public class IoOrderController {
     }
 
 
+    //未校验单据删除
+    @AuthRuleAnnotation("")
+    @PostMapping("udiwms/inout/order/delete")
+    public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) {
+        orderService.deleteByBillNo(deleteRequest.getBillNo());
+        orderDetailBizService.deleteByOrderId(deleteRequest.getBillNo());
+        orderDetailCodeService.deleteByOrderId(deleteRequest.getBillNo());
+        codeTempService.deleteByBillNo(deleteRequest.getBillNo());
+        return ResultVOUtils.success("删除成功！");
+
+    }
+
 }

src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java

@@ -107,7 +107,7 @@ public class ThrDeptController {
             thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity);
         }
             //判断部门是否存在
-
+        filterThrDeptRequest.setCode(thrDeptEntity.getCode());
         filterThrDeptRequest.setName(thrDeptEntity.getName());
         filterThrDeptRequest.setThirdSysFk(thrDeptEntity.getThirdSysFk());
         filterThrDeptRequest.setStatus(thrDeptEntity.getStatus());

src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java

@@ -69,10 +69,11 @@ public class ThrInvWarehouseController {
         List<ThrInvWarehouseEntity> ThrInvWarehouseEntityList = new ArrayList<>();
         List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByPid(invSubWarehouseEntity.getParentId());
         for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
-            if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) && invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){
+            if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) || invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){
                 //添加集合中
                 ThrInvWarehouseEntityList.add(thrInvWarehouseEntity);
             }
+
         }
         if(ThrInvWarehouseEntityList.size()==0){
             invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");

src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.auth;
 
 import com.glxp.api.entity.auth.WarehouseUserEntity;
+import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.FilterInvUserRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,6 +38,7 @@ public interface WarehouseUserDao {
 
     List<WarehouseUserEntity> selectListByCode(@Param("code") String code);
 
+    List<WarehouseUserEntity> selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest);
     List<WarehouseUserEntity> selectCodeByUser(@Param("userId") String userId);
 
     void deleteByCode(@Param("code") String code);

src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java

@@ -1,6 +1,6 @@
 package com.glxp.api.dao.basic;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.basic.BasicBusTypePreEntity;
 import com.glxp.api.req.basic.FilterBusTypeChangeRequest;
 import com.glxp.api.req.basic.FilterBusTypePreRequest;
@@ -14,9 +14,9 @@ import java.util.List;
  * 补单单据类型查询接口
  */
 @Mapper
-public interface BasicBusTypePreDao extends BaseMapper<BasicBusTypePreEntity> {
+public interface BasicBusTypePreDao extends BaseMapperPlus<BasicBusTypePreDao, BasicBusTypePreEntity, BasicBusTypePreEntity> {
 
-    List<BasicBusTypePreEntity> selectList(FilterBusTypeChangeRequest busTypeChangeFilterRequest);
+    List<BasicBusTypePreEntity> filterList(FilterBusTypeChangeRequest busTypeChangeFilterRequest);
 
     /**
      * 根据单据类型删除

src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java

@@ -32,7 +32,7 @@ public class InvProductDetailEntity implements Serializable {
      * 耗材字典ID
      */
     @TableField(value = "relId")
-    private String relId;
+    private Long relId;
 
     /**
      * 最小销售标识

src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java

@@ -10,5 +10,9 @@ import lombok.Data;
 public class FilterInvLinkDataRequest extends ListPageRequest {
 
     private String code;
+    private String key;
+    private String userName;
+    private String employeeName;
+
 
 }

src/main/java/com/glxp/api/req/system/DeleteRequest.java

@@ -9,4 +9,5 @@ public class DeleteRequest {
 
     String id;
     List<String> ids;
+    String billNo;
 }

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -8,7 +8,6 @@ import java.util.Date;
 @Data
 public class IoOrderResponse {
 
-
     private Integer id;
 
     /**
@@ -66,6 +65,16 @@ public class IoOrderResponse {
      */
     private Integer dealStatus;
 
+    /**
+     * -1: "草稿",
+     * 1: "等待处理",
+     * 1: "等待处理",
+     * 2: "等待校验",
+     * 3: "校验异常",
+     * 4: "校验成功",
+     */
+    private String checkStatus;
+
     /**
      * 创建人
      */
@@ -166,8 +175,6 @@ public class IoOrderResponse {
      */
     private String reviewUserName;
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 往来单位名称
      */
@@ -179,10 +186,15 @@ public class IoOrderResponse {
     private String fromInvName;
 
     /**
-     * 部门名称
+     * 当前部门名称
      */
     private String deptName;
 
+    /**
+     * 当前仓库名称
+     */
+    private String invName;
+
     /**
      * 往来名称
      */

src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java

@@ -122,9 +122,15 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
         }
         if (filterInvLinkDataRequest.getPage() != null) {
             int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit();
-            PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit());
+            if("1".equals(filterInvLinkDataRequest.getKey())){
+
+                PageHelper.startPage (offset, filterInvLinkDataRequest.getLimit());
+            }else{
+                PageHelper.offsetPage  (offset, filterInvLinkDataRequest.getLimit());
+            }
+
         }
-        return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode());
+        return warehouseUserDao.selectListkey(filterInvLinkDataRequest);
     }
 
     @Override

src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicBusTypePreDao;
 import com.glxp.api.entity.basic.BasicBusTypePreEntity;
+import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.req.basic.FilterBusTypeChangeRequest;
 import com.glxp.api.req.basic.FilterBusTypePreRequest;
 import com.glxp.api.res.basic.BasicBusTypePreResponse;
@@ -33,7 +34,7 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService {
         if (null != busTypeChangeFilterRequest.getPage() && null != busTypeChangeFilterRequest.getLimit()) {
             PageHelper.offsetPage((busTypeChangeFilterRequest.getPage() - 1) * busTypeChangeFilterRequest.getLimit(), busTypeChangeFilterRequest.getLimit());
         }
-        return basicBusTypePreDao.selectList(busTypeChangeFilterRequest);
+        return basicBusTypePreDao.filterList(busTypeChangeFilterRequest);
     }
 
     @Override
@@ -75,8 +76,8 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService {
     }
 
     @Override
-    public BasicBusTypePreEntity findByOriginAction(String orginAction) {
-        return basicBusTypePreDao.selectOne(new QueryWrapper<BasicBusTypePreEntity>().eq("originAction", orginAction));
+    public BasicBusTypePreEntity findByOriginAction(String originAction) {
+        return basicBusTypePreDao.selectOne(new QueryWrapper<BasicBusTypePreEntity>().eq("originAction", originAction));
     }
 
     /**

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -131,6 +131,15 @@ public class IoCheckInoutService {
 
         });
 
+        //临时表转正式表
+        List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
+        for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
+            IoCodeEntity codeEnttity = new IoCodeEntity();
+            BeanUtils.copyProperties(codeTempEntity, codeEnttity);
+            codeService.insert(codeEnttity);
+        }
+        codeTempService.deleteByBillNo(orderEntity.getBillNo());
+
         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
         orderEntity.setUpdateTime(new Date());
         orderService.update(orderEntity);
@@ -336,6 +345,8 @@ public class IoCheckInoutService {
                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_RECEIVEED);
                 }
             }
+        } else {
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_RECEIVEED);
         }
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_RECEIVEED) {
             orderEntity.setUpdateTime(new Date());

src/main/java/com/glxp/api/service/inout/IoGenInvService.java

@@ -111,6 +111,7 @@ public class IoGenInvService {
         for (IoCodeEntity codeEntity : codeEnttities) {
             InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
             BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
+            invProductDetailEntity.setRelId(codeEntity.getRelId());
             invProductDetailEntity.setUpdateTime(new Date());
             invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
             invProductDetailEntities.add(invProductDetailEntity);
@@ -221,6 +222,7 @@ public class IoGenInvService {
             temps = filterSupMaps.get(corpName);
             IoOrderEntity outOrder = new IoOrderEntity();
             BeanUtils.copyProperties(orderEntity, outOrder);
+            outOrder.setId(null);
             outOrder.setSupplementNo(null);//补单需置空
             outOrder.setCreateTime(DateUtil.getBeforeDay(DateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
             outOrder.setAction(targetBustypeEntity.getAction());

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -16,6 +16,8 @@ public interface IoOrderDetailBizService {
 
     int deleteById(Integer id);
 
+    int deleteByOrderId(String billNo);
+
     boolean isExit(Long relId, String bacthNo, Integer ignoreId);
 
     List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);

src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java

@@ -32,7 +32,7 @@ public interface IoOrderDetailCodeService {
      * @param orderId
      * @return
      */
-    BaseResponse deleteByOrderId(String orderId);
+    int deleteByOrderId(String orderId);
 
     public List<IoOrderDetailCodeEntity> checkOrderList(String orderId);
 }

src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java

@@ -12,6 +12,8 @@ public interface IoOrderDetailResultService {
 
     int insert(IoOrderDetailResultEntity orderDetailResultEntity);
 
+    int deleteByOrderId(String billNo);
+
     int update(IoOrderDetailResultEntity orderDetailResultEntity);
 
     List<IoOrderDetailResultResponse> filterList(FilterOrderDetailResultRequest orderDetailResultRequest);

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -23,6 +23,10 @@ public interface IoOrderService {
 
     int updateByBillNo(IoOrderEntity orderEntity);
 
+    int deleteById(Integer id);
+
+    int deleteByBillNo(String billNo);
+
     /**
      * 查询单据列表
      *

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -42,6 +42,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.deleteById(id);
     }
 
+    @Override
+    public int deleteByOrderId(String billNo) {
+        return ioOrderDetailBizDao.delete(new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk", billNo));
+    }
+
 
     @Override
     public boolean isExit(Long relId, String bacthNo, Integer ignoreId) {

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -58,12 +58,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
     }
 
     @Override
-    public BaseResponse deleteByOrderId(String orderId) {
-        if (StrUtil.isBlank(orderId)) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据号不能为空！");
-        }
-        ioOrderDetailCodeDao.delete(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId));
-        return ResultVOUtils.success("删除成功");
+    public int deleteByOrderId(String orderId) {
+        return ioOrderDetailCodeDao.delete(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId));
     }
 
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java

@@ -29,6 +29,11 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
         return orderDetailResultDao.insert(orderDetailResultEntity);
     }
 
+    @Override
+    public int deleteByOrderId(String billNo) {
+        return orderDetailResultDao.delete(new QueryWrapper<IoOrderDetailResultEntity>().eq("orderIdFk", billNo));
+    }
+
     @Override
     public int update(IoOrderDetailResultEntity orderDetailResultEntity) {
         return orderDetailResultDao.updateById(orderDetailResultEntity);

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -60,6 +60,16 @@ public class IoOrderServiceImpl implements IoOrderService {
         return orderDao.update(orderEntity, new QueryWrapper<IoOrderEntity>().eq("billNo", orderEntity.getBillNo()));
     }
 
+    @Override
+    public int deleteById(Integer id) {
+        return orderDao.deleteById(id);
+    }
+
+    @Override
+    public int deleteByBillNo(String billNo) {
+        return orderDao.delete(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo));
+    }
+
     @Override
     public List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest) {
         if (null == filterOrderRequest) {

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 60

src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml

@@ -52,7 +52,7 @@
                                remark)
         values (#{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
                 #{invStorageCode,jdbcType=VARCHAR},
-                #{invWarehouseCode,jdbcType=VARCHAR}, #{status,jdbcType=BOOLEAN}, #{createTime,jdbcType=TIMESTAMP},
+                #{invWarehouseCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
                 #{updateTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR},
                 #{remark,jdbcType=VARCHAR})
     </insert>

src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml

@@ -252,6 +252,23 @@
         where code = #{code}
     </select>
 
+    <select id="selectListkey"  resultType="com.glxp.api.entity.auth.WarehouseUserEntity" parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest">
+        select auth_warehouse_user.*, auth_user.employeeName
+        from auth_warehouse_user
+                 inner join auth_user on auth_user.id = auth_warehouse_user.userId
+        <where>
+            <if test="code != '' and code != null">
+                AND code = #{code}
+            </if>
+            <if test="userName != '' and userName != null">
+                AND auth_warehouse_user.userName = #{userName}
+            </if>
+            <if test="employeeName != '' and employeeName != null">
+                AND auth_user.employeeName = #{employeeName}
+            </if>
+        </where>
+    </select>
+
 
     <select id="filterList" parameterType="com.glxp.api.req.auth.FilterInvUserRequest"
             resultType="com.glxp.api.entity.auth.WarehouseUserEntity">

src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicBusTypePreDao">
-    <select id="selectList" resultType="com.glxp.api.entity.basic.BasicBusTypePreEntity">
+    <select id="filterList" resultType="com.glxp.api.entity.basic.BasicBusTypePreEntity">
         select *
         from basic_bustype_pre
         <where>
-            <if test="originName != null and originName != ''">
+            <if test="originAction != null and originAction != ''">
                 AND originAction like concat('%', #{originAction}, '%')
             </if>
         </where>
@@ -18,12 +18,12 @@
     </delete>
 
     <select id="findByAction" resultType="com.glxp.api.entity.basic.BasicBusTypePreEntity">
-        select basic_bustype_pre.* ,
-            basic_bussiness_type.name
+        select basic_bustype_pre.*,
+               basic_bussiness_type.name
         from basic_bustype_pre
-        left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action
-        left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code
-        left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code
+                 left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action
+                 left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code
+                 left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code
         where basic_bustype_pre.action = #{action}
     </select>
 

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -2,20 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoOrderDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderResponse">
-        select io_order.*,
-               bu.name                billTypeName,
-               auth_user.employeeName createUserName,
-               auth_dept.name         deptName,
-               auth_warehouse.name    invName
-        from io_order
-                 left join basic_bussiness_type bu on io_order.action = bu.action
-                 left join auth_user on auth_user.id = io_order.createUser or auth_user.id = io_order.updateUser
-            or auth_user.id = io_order.reviewUser
-                 left join auth_dept on auth_dept.code = io_order.deptCode
-                 left join auth_warehouse on auth_warehouse.code = io_order.invCode
+        select io.*,
+               (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
+               (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
+               (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
+               (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
+               (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
+               (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
+               (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
+               (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
+               (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName
+        from io_order as io
         <where>
             <if test="id != null and id != ''">
-                AND io_order.id = #{id}
+                AND id = #{id}
             </if>
             <if test="billNo != null and billNo != ''">
                 AND billNo like concat('%', #{billNo}, '%')
@@ -30,19 +30,20 @@
                 AND invCode = #{invCode}
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND io_order.createTime between #{startTime} and #{endTime}
+                AND createTime between #{startTime} and #{endTime}
             </if>
             <if test="startTime != null and startTime != ''">
-                AND io_order.createTime >= #{startTime}
+                AND createTime >= #{startTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND io_order.createTime &lt;= #{endTime}
+                AND createTime &lt;= #{endTime}
             </if>
         </where>
     </select>
 
     <select id="filterOrderList" resultType="com.glxp.api.entity.inout.IoOrderEntity">
-        select * from io_order
+        select *
+        from io_order
         <where>
             <if test="billNo != null and billNo != ''">
                 AND billNo like concat('%', #{billNo}, '%')