Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/constant/Constant.java

@@ -21,8 +21,6 @@ public class Constant {
     public static final String TH_ORDER = "TH";     //退货
 
 
-
-
     /**
      * 盘点单据前缀
      */
@@ -215,4 +213,20 @@ public class Constant {
     public static final String ORDER_STATUS_SUP_SEARCH = "supSearch";
 
 
+    /**前端页面查询相关单据类型标识*/
+
+
+    /**
+     * 送货管理界面：     supDelivery
+     * 到货单管理界面：    supArrival
+     * 退货单管理界面：    supReturned
+     * 采购入库单界面：    supPurchase
+     * 发票登记界面：      supInvoice
+     * 出入库明细账       norDetail
+     * 寄售出入库明细账     preDetail
+     */
+
+    public static final String ORDER_ACTION_NOR_DETAIL = "norDetail";
+    public static final String ORDER_ACTION_PRE_DETAIL = "preDetail";
+
 }

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -9,10 +9,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
-import com.glxp.api.entity.basic.BasicCorpEntity;
+import com.glxp.api.entity.basic.*;
-import com.glxp.api.entity.basic.UdiEntity;
-import com.glxp.api.entity.basic.UdiProductEntity;
-import com.glxp.api.entity.basic.UdiRlSupEntity;
 import com.glxp.api.entity.system.CompanyEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
@@ -234,6 +231,11 @@ public class UdiRlSupController extends BaseController {
         if (vailResult != null)
             return ResultVOUtils.error(500, vailResult);
         companyProductsRelService.insertCompanyProducts(udiInfoExportRequest);
+
+        UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+        udiRelevanceEntity.setId(Long.parseLong(rlidStr));
+        udiRelevanceEntity.setLockStatus(1);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         BeanUtils.copyProperties(udiProductEntity, udiInfoExportRequest.getSupplementRequest());
         udiProductService.insertUdiInfo(udiProductEntity);

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

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.inout;
 
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -8,14 +9,19 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.inout.IoCodeLostEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.inout.IoCodeLostResponse;
 import com.glxp.api.service.inout.IoCodeLostService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.Date;
+import java.util.List;
 
 @RestController
 public class IoCodeLostController extends BaseController {
@@ -24,6 +30,39 @@ public class IoCodeLostController extends BaseController {
     @Resource
     IoCodeLostService codeLostService;
 
+    @AuthRuleAnnotation("")
+    @PostMapping("warehouse/inout/getCodeLost")
+    public BaseResponse getCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<IoCodeLostResponse> list = codeLostService.selectLost(ioCodeLostEntity);
+        PageInfo<IoCodeLostResponse> pageInfo;
+        pageInfo= new PageInfo<>(list);
+        PageSimpleResponse<IoCodeLostResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("warehouse/inout/updateCodeLost")
+    public BaseResponse updateCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+
+        codeLostService.update(ioCodeLostEntity);
+
+        return ResultVOUtils.success("成功");
+    }
+
+
+
+
+
+
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/saveTabCode")
     public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) {

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

@@ -73,6 +73,11 @@ public class IoOrderController extends BaseController {
         if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
             orderService.setFilterStatus(filterOrderRequest);
         }
+        if (StrUtil.isNotBlank(filterOrderRequest.getActionType())) {
+            orderService.setActions(filterOrderRequest);
+        }
+
+
         String customerId = getCustomerId();
         if (!customerId.equals("110")) {
             filterOrderRequest.setFromCorp(customerId);
@@ -226,9 +231,6 @@ public class IoOrderController extends BaseController {
     }
 
 
-
-
-
     @Resource
     IoCodeService codeService;
 

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

@@ -149,15 +149,12 @@ public class IoOrderDetailBizController extends BaseController {
 //            todo 查询产品是否已经通过认证
 
             if (isVailCert && udiRelevanceResponse.isNeedCert()) {
-
                 SupProductEntity supProductEntity = supProductService.findByRelIdFk(udiRelevanceResponse.getId() + "");
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
 
                 } else {
                     return ResultVOUtils.error(500, "产品资质证书未通过审核！");
                 }
-
-
             }
 
             IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();

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

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.inout;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -13,6 +14,7 @@ import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
@@ -67,7 +69,13 @@ public class IoOrderDetailResultController extends BaseController {
         } else {
             orderDetailResultRequest.setFromCorp(getCustomerId());
         }
-
+        FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
+        filterOrderRequest.setActionType(orderDetailResultRequest.getActionType());
+        List<String> actions = orderService.setActions(filterOrderRequest);
+        if (CollUtil.isEmpty(actions)) {
+            return ResultVOUtils.success("");
+        }
+        orderDetailResultRequest.setActions(actions);
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest);
 
 //        for (IoOrderDetailResultResponse orderDetailResultResponse : list) {

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -8,6 +8,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.entity.inv.InvProductEntity;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
@@ -39,7 +40,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-public class InvProductController {
+public class InvProductController extends BaseController {
 
     @Resource
     private InvProductService invProductService;
@@ -51,7 +52,6 @@ public class InvProductController {
     private CustomerService customerService;
 
 
-
     /**
      * 库存列表查询接口
      *
@@ -65,6 +65,7 @@ public class InvProductController {
             filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
         }
 
+
         if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
             List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
             if (CollUtil.isNotEmpty(invCodes)) {
@@ -72,6 +73,13 @@ public class InvProductController {
             }
         }
 
+        if (isHosUser()) {
+
+        } else {
+            filterInvProductRequest.setSupId(getCustomerId());
+        }
+
+
         List<InvProductResponse> list = invProductService.filterListProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         InvProductPageResponse<InvProductResponse> pageResponse = new InvProductPageResponse();

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -219,6 +219,11 @@ public class PurOrderController {
     }
 
 
+    public void genOrder() {
+
+    }
+
+
     /**
      * 查询采购订单列表
      */

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

@@ -1,6 +1,7 @@
 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.BasicBussinessTypeEntity;
 import com.glxp.api.req.basic.FilterBussinessTypeRequest;
 import com.glxp.api.res.basic.BasicBussinessTypeResponse;
@@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface BasicBussinessTypeDao extends BaseMapper<BasicBussinessTypeEntity> {
+public interface BasicBussinessTypeDao extends BaseMapperPlus<BasicBussinessTypeDao, BasicBussinessTypeEntity, BasicBussinessTypeEntity> {
 
 
     /**

src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java

@@ -2,8 +2,13 @@ package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoCodeLostEntity;
+import com.glxp.api.res.inout.IoCodeLostResponse;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface IoCodeLostMapper extends BaseMapperPlus<IoCodeLostMapper, IoCodeLostEntity, IoCodeLostEntity> {
+    List<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity);
 }
+

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -358,7 +358,7 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "busType")
     private Integer busType;           //1:正常；2：送货；3.到货,4:退货
 
-    @TableField(value = "inStock")
+    @TableField(value = "inStock")      //是否更改库存，1：是；0：否
     private boolean inStock;
 
 

src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java

@@ -76,6 +76,20 @@ public class IoCodeLostEntity {
     @TableField(value = "nameCode")
     private String nameCode;
 
+    @TableField(exist = false)
+    private String cpmctymc;
+
+    @TableField(exist = false)
+    private String ggxh;
+
+    @TableField(exist = false)
+    private String startTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
+
+
     public static final String COL_ID = "id";
 
     public static final String COL_CODE = "code";

src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.util.Date;
+
 import lombok.Data;
 
 @Data
@@ -18,6 +20,9 @@ public class PurOrderEntity {
      */
     @TableField(value = "billNo")
     private String billNo;
+    @TableField(value = "supId")
+    private String supId;
+
 
     /**
      * 单据日期

src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java

@@ -3,6 +3,8 @@ package com.glxp.api.req.inout;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 单据扫码明细查询参数
  */
@@ -40,6 +42,6 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String startAduditTime;  //起始日期
     private String endAduditTime;       //结束日期
     private String fromCorp;
-
+    private String actionType;
-
+    private List<String> actions;
 }

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -145,6 +145,8 @@ public class FilterOrderRequest extends ListPageRequest {
      * 退货单管理界面：    supReturned
      * 采购入库单界面：    supPurchase
      * 发票登记界面：      supInvoice
+     * 出入库明细账       norDetail
+     * 寄售出入库明细账     preDetail
      */
     private String actionType;
 
@@ -152,6 +154,11 @@ public class FilterOrderRequest extends ListPageRequest {
     private Integer orderType;
     private Integer syncStatus;
 
+    /**
+     * 单据类型集合
+     */
+    private List<String> actions;
+
     /**
      * 单据状态集合
      */

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

@@ -0,0 +1,72 @@
+package com.glxp.api.res.inout;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : zhangsan
+ * @date : 2023/3/22 11:08
+ * @modyified By :
+ */
+@Data
+public class IoCodeLostResponse {
+
+    private Integer id;
+
+    private String code;
+
+
+    private String batchNo;
+
+
+    private String produceDate;
+
+
+    private String expireDate;
+
+
+    private String serialNo;
+
+
+    private String supId;
+
+
+    private Date createTime;
+
+
+    private Date updateTime;
+
+
+    private String remark;
+
+    //产品名称
+    private String cpmctymc;
+   //规格型号
+    private String ggxh;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_BATCHNO = "batchNo";
+
+    public static final String COL_PRODUCEDATE = "produceDate";
+
+    public static final String COL_EXPIREDATE = "expireDate";
+
+    public static final String COL_SERIALNO = "serialNo";
+
+    public static final String COL_SUPID = "supId";
+
+    public static final String COL_CREATETIME = "createTime";
+
+    public static final String COL_UPDATETIME = "updateTime";
+
+    public static final String COL_REMARK = "remark";
+
+
+}

src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java

@@ -71,6 +71,8 @@ public class InvPreinDetailResponse {
     private String auditTime;
     private String billNo;
     private String invName;
+    private String measname;
+    private String fromName;
 
 
 }

src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java

@@ -76,4 +76,7 @@ public class PurOrderResponse {
     private String emergency;
 
     private Date arrivalTime;
+
+    private String supId;
+    private String supName;
 }

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

@@ -1,9 +1,15 @@
 package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoCodeLostEntity;
+import com.glxp.api.res.inout.IoCodeLostResponse;
+
+import java.util.List;
 
 public interface IoCodeLostService {
 
+    List<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity);
+
+
     IoCodeLostEntity findByCode(String code);
 
     int insert(IoCodeLostEntity ioCodeLostEntity);

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

@@ -74,6 +74,8 @@ public interface IoOrderService {
      */
     void setFilterStatus(FilterOrderRequest filterOrderRequest);
 
+    List<String> setActions(FilterOrderRequest filterOrderRequest);
+
     /**
      * 查询单号关联的所有单据数据
      *

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

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inout.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.api.res.inout.IoCodeLostResponse;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -9,6 +10,8 @@ import com.glxp.api.dao.inout.IoCodeLostMapper;
 import com.glxp.api.entity.inout.IoCodeLostEntity;
 import com.glxp.api.service.inout.IoCodeLostService;
 
+import java.util.List;
+
 @Service
 public class IoCodeLostServiceImpl implements IoCodeLostService {
 
@@ -16,6 +19,11 @@ public class IoCodeLostServiceImpl implements IoCodeLostService {
     IoCodeLostMapper codeLostEntityMapper;
 
 
+    @Override
+    public List<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity) {
+        return codeLostEntityMapper.selectLost(ioCodeLostEntity);
+    }
+
     @Override
     public IoCodeLostEntity findByCode(String code) {
 

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

@@ -526,7 +526,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 break;
             case Constant.ORDER_STATUS_AUDITED:
                 filterOrderRequest.setStatuses(Arrays.asList(7));
-                filterOrderRequest.setDealStatuses(Arrays.asList(3,4));
+                filterOrderRequest.setDealStatuses(Arrays.asList(3, 4));
                 break;
             case Constant.ORDER_STATUS_SUP_SEARCH:
                 filterOrderRequest.setStatuses(Arrays.asList(5, 7));
@@ -537,6 +537,36 @@ public class IoOrderServiceImpl implements IoOrderService {
         }
     }
 
+
+    @Override
+    public List<String> setActions(FilterOrderRequest filterOrderRequest) {
+        List<BasicBussinessTypeEntity> bussinessTypeEntities;
+        List<String> actions = null;
+        if (filterOrderRequest.getActionType() == null)
+            return null;
+        switch (filterOrderRequest.getActionType()) {
+
+            case Constant.ORDER_ACTION_NOR_DETAIL:
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .eq("actionType", 1).eq("inStock", true));
+                actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
+                filterOrderRequest.setActions(actions);
+                break;
+
+            case Constant.ORDER_ACTION_PRE_DETAIL:
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .eq("actionType", 3).eq("inStock", true));
+                actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
+                filterOrderRequest.setActions(actions);
+                break;
+
+            default:
+                break;
+        }
+        ;
+        return actions;
+    }
+
     @Override
     public List<IoOrderEntity> filterOrderTrace(String billNo) {
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo));

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

@@ -1,4 +1,29 @@
 <?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.inout.IoCodeLostMapper">
+
+    <select id="selectLost"    parameterType="com.glxp.api.entity.inout.IoCodeLostEntity"
+            resultType="com.glxp.api.res.inout.IoCodeLostResponse">
+        select io_code_lost.*,basic_products.cpmctymc ,basic_products.ggxh from  io_code_lost
+        LEFT JOIN basic_products on  io_code_lost.nameCode=basic_products.nameCode
+        <where>
+            <if test="code != '' and code != null">
+                and code like concat('%',#{code},'%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                and basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                and basic_products.ggxh like concat('%',#{ggxh},'%')
+            </if>
+
+            <if test="batchNo != '' and batchNo != null">
+                and batchNo like concat('%',#{batchNo},'%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(io_code_lost.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+            </if>
+
+        </where>
+    </select>
 </mapper>

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

@@ -52,6 +52,13 @@
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
                 AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
+            <if test="actions != null and actions.size() != 0">
+                AND `action` in
+                <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
             <if test="statuses != null and statuses.size() != 0">
                 AND status in
                 <foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">

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

@@ -24,7 +24,8 @@
     </select>
 
     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
-        SELECT a2.*,a1.mainAction,
+        SELECT a2.*,
+               a1.mainAction,
                b1.NAME AS                                                               fromCorpName,
                (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
         FROM io_order_detail_result a2
@@ -58,6 +59,12 @@
             <if test="productName != null and productName != ''">
                 AND a2.coName like concat('%', #{productName}, '%')
             </if>
+            <if test="actions != null and actions.size() != 0">
+                AND a1.`action` in
+                <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 </mapper>

src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml

@@ -8,14 +8,17 @@
                bp.ggxh,
                bp.manufactory,
                bp.zczbhhzbapzbh,
+               bp.measname,
                inv_prein_order.auditTime,
                inv_prein_order.billNo,
-               aw.name     invName
+               aw.name     invName,
+               bc.name     fromName
         from inv_prein_detail ic
                      inner join inv_prein_order on orderId = inv_prein_order.billNo
                      left join basic_udirel bu on bu.id = ic.relId
                      left join basic_products bp on bu.uuid = bp.uuid
                      left join auth_warehouse aw on inv_prein_order.invCode = aw.code
+                     left join basic_corp bc on inv_prein_order.fromCorp = bc.erpId
         <where>
             <if test="orderId != null and orderId != ''">
                 AND ic.orderId = #{orderId}

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -4,46 +4,44 @@
     <resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderEntity">
         <!--@mbg.generated-->
         <!--@Table pur_order-->
-    <id column="id" jdbcType="BIGINT" property="id" />
+        <id column="id" jdbcType="BIGINT" property="id"/>
-    <result column="billNo" jdbcType="VARCHAR" property="billNo" />
+        <result column="billNo" jdbcType="VARCHAR" property="billNo"/>
-    <result column="billDate" jdbcType="TIMESTAMP" property="billDate" />
+        <result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
-    <result column="status" jdbcType="TINYINT" property="status" />
+        <result column="status" jdbcType="TINYINT" property="status"/>
-    <result column="billType" jdbcType="VARCHAR" property="billType" />
+        <result column="billType" jdbcType="VARCHAR" property="billType"/>
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
-    <result column="invCode" jdbcType="VARCHAR" property="invCode" />
+        <result column="invCode" jdbcType="VARCHAR" property="invCode"/>
-    <result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
+        <result column="deptCode" jdbcType="VARCHAR" property="deptCode"/>
-    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+        <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
-    <result column="auditUser" jdbcType="VARCHAR" property="auditUser" />
+        <result column="auditUser" jdbcType="VARCHAR" property="auditUser"/>
-    <result column="auditTime" jdbcType="TIMESTAMP" property="auditTime" />
+        <result column="auditTime" jdbcType="TIMESTAMP" property="auditTime"/>
-    <result column="auditRemark" jdbcType="VARCHAR" property="auditRemark" />
+        <result column="auditRemark" jdbcType="VARCHAR" property="auditRemark"/>
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
-    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+        <result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
-    <result column="applyCreateUser" jdbcType="VARCHAR" property="applyCreateUser" />
+        <result column="applyCreateUser" jdbcType="VARCHAR" property="applyCreateUser"/>
-    <result column="applyAuditUser" jdbcType="VARCHAR" property="applyAuditUser" />
+        <result column="applyAuditUser" jdbcType="VARCHAR" property="applyAuditUser"/>
-    <result column="applyRemark" jdbcType="VARCHAR" property="applyRemark" />
+        <result column="applyRemark" jdbcType="VARCHAR" property="applyRemark"/>
-    <result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo" />
+        <result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo"/>
-    <result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo" />
+        <result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo"/>
+        <result column="supId" jdbcType="VARCHAR" property="supId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`,
         createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser,
-    applyAuditUser, applyRemark, applyBillNo, stockOrderNo
+        applyAuditUser, applyRemark, applyBillNo, stockOrderNo,supId
     </sql>
 
 
     <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
             resultType="com.glxp.api.res.purchase.PurOrderResponse">
-
+        SELECT pur_order.*,
-    SELECT
-    pur_order.*,
                cb.employeeName     createUserName,
                ab.employeeName     auditUserName,
                auth_warehouse.NAME invName,
                auth_dept.`name`    deptName
-    FROM
+        FROM pur_order
-    pur_order
                      LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
                      LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
                      LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
@@ -52,26 +50,34 @@
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}
             </if>
-      <if test="startDate != null and startDate !=''">
+            <if test="startDate != null and startDate != ''">
-        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d')>= #{startDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') >= #{startDate}
+                ]]>
             </if>
-      <if test="endDate != null and endDate !=''">
+            <if test="endDate != null and endDate != ''">
-        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') <= #{endDate}
+                ]]>
             </if>
-      <if test="startAuditDate != null and startAuditDate !=''">
+            <if test="startAuditDate != null and startAuditDate != ''">
-        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') >= #{startAuditDate}
+                ]]>
             </if>
-      <if test="endAuditDate != null and endAuditDate !=''">
+            <if test="endAuditDate != null and endAuditDate != ''">
-        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') <= #{endAuditDate}
+                ]]>
             </if>
-      <if test="status!=null and status!=10 and status!=11">
+            <if test="status != null and status != 10 and status != 11">
                 and pur_order.status = #{status}
             </if>
-      <if test="status ==10">
+            <if test="status == 10">
-        and ( pur_order.status = 3 or pur_order.status=2 or pur_order.status=4)
+                and (pur_order.status = 3 or pur_order.status = 2 or pur_order.status = 4)
             </if>
-      <if test="status ==11">
+            <if test="status == 11">
-        and ( pur_order.status = 1 or pur_order.status=2 or pur_order.status=4)
+                and (pur_order.status = 1 or pur_order.status = 2 or pur_order.status = 4)
             </if>
 
             <if test="deptCode != '' and deptCode != null">
@@ -87,8 +93,5 @@
                 AND createUser = #{createUser}
             </if>
         </where>
-
     </select>
-
-
 </mapper>

src/main/resources/schemas/schema_v2.1.sql

@@ -76,6 +76,7 @@ CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1);
 
 CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1);
 CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);