Merge branch 'master' into test

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

@@ -13,6 +13,7 @@ public class Constant {
     public static final String SERIAL_CACHE_PREFIX = "serial_";
     public static final String SERIAL_CACHE_PREFIX_ST = "serialst_";
     public static final String SERIAL_CACHE_PREFIX_STAT = "serialstat_";
+    public static final String SERIAL_CACHE_PREFIX_PLACE = "serialplace_";
     public static final String SERIAL_CACHE_SYNC_UDI = "syncUdi";
 
     /**
@@ -67,6 +68,11 @@ public class Constant {
      */
     public static final String DEVICE_INSPECT_ORDER = "DIO";
 
+    /**
+     * 物资上架记录号前缀
+     */
+    public static final String INV_PLACE_ORDER = "PO";
+
 
     public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS";
     public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS";

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

@@ -0,0 +1,31 @@
+package com.glxp.api.controller.inv;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.req.inv.FilterInvPlaceOrderRequest;
+import com.glxp.api.res.inv.InvPlaceOrderResponse;
+import com.glxp.api.service.inv.InvPlaceOrderService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 物资上架记录接口
+ */
+@RestController
+public class InvPlaceOrderController {
+
+    @Resource
+    private InvPlaceOrderService invPlaceOrderService;
+
+    @GetMapping("/udiwms/inv/place/order/filter")
+    public BaseResponse filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) {
+        List<InvPlaceOrderResponse> list = invPlaceOrderService.filterList(filterInvPlaceOrderRequest);
+        PageInfo<InvPlaceOrderResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+}

src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDao.java

@@ -0,0 +1,13 @@
+package com.glxp.api.dao.inv;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inv.InvPlaceOrderEntity;
+import com.glxp.api.req.inv.FilterInvPlaceOrderRequest;
+import com.glxp.api.res.inv.InvPlaceOrderResponse;
+
+import java.util.List;
+
+public interface InvPlaceOrderDao extends BaseMapper<InvPlaceOrderEntity> {
+
+    List<InvPlaceOrderResponse> filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest);
+}

src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java

@@ -0,0 +1,8 @@
+package com.glxp.api.dao.inv;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity;
+
+public interface InvPlaceOrderDetailDao extends BaseMapper<InvPlaceOrderDetailEntity> {
+
+}

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

@@ -0,0 +1,58 @@
+package com.glxp.api.entity.inv;
+
+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 lombok.Data;
+
+@Data
+@TableName(value = "inv_place_order_detail")
+public class InvPlaceOrderDetailEntity {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 上架记录号
+     */
+    @TableField(value = "recordId")
+    private String recordId;
+
+    /**
+     * 仓库号
+     */
+    @TableField(value = "invCode")
+    private String invCode;
+
+    /**
+     * 货位号
+     */
+    @TableField(value = "invSpaceCode")
+    private String invSpaceCode;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 物资编码
+     */
+    @TableField(value = "relId")
+    private String relId;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 数量
+     */
+    @TableField(value = "`count`")
+    private Integer count;
+
+}

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

@@ -0,0 +1,63 @@
+package com.glxp.api.entity.inv;
+
+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 lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 上架记录表
+ */
+@Data
+@TableName(value = "inv_place_order")
+public class InvPlaceOrderEntity {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 上架记录号
+     */
+    @TableField(value = "recordId")
+    private String recordId;
+
+    /**
+     * 上架方式  1：按物资上架  2：按单上架
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    /**
+     * 单据号
+     */
+    @TableField(value = "orderId")
+    private String orderId;
+
+    /**
+     * 操作人
+     */
+    @TableField(value = "`createUser`")
+    private String createUser;
+
+    /**
+     * 上架时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+}

src/main/java/com/glxp/api/req/inv/AddInvPlaceOrderRequest.java

@@ -0,0 +1,24 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.entity.inv.InvProductDetailEntity;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 添加物资上架记录参数
+ */
+@Data
+public class AddInvPlaceOrderRequest {
+
+    private String invCode;
+
+    private String invSpaceCode;
+
+    private Integer type;
+
+    private String orderId;
+
+    private List<InvProductDetailEntity> codeList;
+
+}

src/main/java/com/glxp/api/req/inv/FilterInvPlaceOrderDetailRequest.java

@@ -0,0 +1,11 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterInvPlaceOrderDetailRequest extends ListPageRequest {
+
+    private String recordId;
+
+}

src/main/java/com/glxp/api/req/inv/FilterInvPlaceOrderRequest.java

@@ -0,0 +1,32 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * 物资上架记录接口查询参数
+ */
+@Data
+public class FilterInvPlaceOrderRequest extends ListPageRequest {
+
+    private String recordId;
+
+    private String invCode;
+
+    private String invSpaceCode;
+
+    private Integer type;
+
+    private String orderId;
+
+    private String code;
+
+    private String nameCode;
+
+    private String productName;
+
+    private String batchNo;
+
+    private String zczbhhzbapzbh;
+
+}

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

@@ -40,4 +40,14 @@ public class BindInvSpaceRequest {
      */
     private String code;
 
+    /**
+     * 上架方式     1：按物资上架  2：按单上架
+     */
+    private Integer type;
+
+    /**
+     * 单号
+     */
+    private String orderId;
+
 }

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

@@ -0,0 +1,95 @@
+package com.glxp.api.res.inv;
+
+import lombok.Data;
+
+/**
+ * 物资上架详情VO
+ */
+@Data
+public class InvPlaceOrderDetailResponse {
+
+    /**
+     * 库存详情ID
+     */
+    private Integer id;
+
+    /**
+     * UDI码
+     */
+    private String code;
+
+    /**
+     * 耗材字典ID
+     */
+    private String relId;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 产品DI
+     */
+    private String nameCode;
+
+    /**
+     * 注册证，批准文号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产厂家
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 货位码
+     */
+    private String invSpaceCode;
+
+    /**
+     * 供应商名称
+     */
+    private String supName;
+
+    /**
+     * 序列号
+     */
+    private String serialNo;
+
+    /**
+     * 计量单位
+     */
+    private String measname;
+
+    /**
+     * 生产厂家
+     */
+    private String manufactory;
+
+    private Integer count;
+
+    private String recordId;
+
+}

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

@@ -0,0 +1,136 @@
+package com.glxp.api.res.inv;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 物资上架记录VO类
+ */
+@Data
+public class InvPlaceOrderResponse {
+
+    /**
+     * 上架记录号
+     */
+    private String recordId;
+
+    /**
+     * 上架方式  1：按物资上架  2：按单上架
+     */
+    private Integer type;
+
+    /**
+     * 单据号
+     */
+    private String orderId;
+
+    /**
+     * 仓库号
+     */
+    private String invCode;
+
+    /**
+     * 货位号
+     */
+    private String invSpaceCode;
+
+    /**
+     * 操作人
+     */
+    private String createUser;
+
+    /**
+     * 上架时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private String invName;
+
+    private String invSpaceName;
+
+    private String operatorName;
+
+    /**
+     * UDI码
+     */
+    private String code;
+
+    /**
+     * 耗材字典ID
+     */
+    private String relId;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 产品DI
+     */
+    private String nameCode;
+
+    /**
+     * 注册证，批准文号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产厂家
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 供应商名称
+     */
+    private String supName;
+
+    /**
+     * 序列号
+     */
+    private String serialNo;
+
+    /**
+     * 计量单位
+     */
+    private String measname;
+
+    /**
+     * 生产厂家
+     */
+    private String manufactory;
+
+    private Integer count;
+
+}

src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java

@@ -0,0 +1,19 @@
+package com.glxp.api.service.inv;
+
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.req.inv.AddInvPlaceOrderRequest;
+import com.glxp.api.req.inv.FilterInvPlaceOrderRequest;
+import com.glxp.api.res.inv.InvPlaceOrderResponse;
+
+import java.util.List;
+
+/**
+ * 物资上架记录Service
+ */
+public interface InvPlaceOrderService {
+
+    List<InvPlaceOrderResponse> filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest);
+
+    BaseResponse addInvPlaceOrder(AddInvPlaceOrderRequest addInvPlaceOrderRequest);
+
+}

src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java

@@ -0,0 +1,93 @@
+package com.glxp.api.service.inv.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.Constant;
+import com.glxp.api.dao.inv.InvPlaceOrderDao;
+import com.glxp.api.dao.inv.InvPlaceOrderDetailDao;
+import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity;
+import com.glxp.api.entity.inv.InvPlaceOrderEntity;
+import com.glxp.api.req.inv.AddInvPlaceOrderRequest;
+import com.glxp.api.req.inv.FilterInvPlaceOrderRequest;
+import com.glxp.api.res.inv.InvPlaceOrderResponse;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.inv.InvPlaceOrderService;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
+
+    @Resource
+    private InvPlaceOrderDao invPlaceOrderDao;
+    @Resource
+    private InvPlaceOrderDetailDao invPlaceOrderDetailDao;
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private GennerOrderUtils gennerOrderUtils;
+
+    @Override
+    public List<InvPlaceOrderResponse> filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) {
+        if (null == filterInvPlaceOrderRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterInvPlaceOrderRequest.getPage() && null != filterInvPlaceOrderRequest.getLimit()) {
+            PageHelper.offsetPage((filterInvPlaceOrderRequest.getPage() - 1) * filterInvPlaceOrderRequest.getLimit(), filterInvPlaceOrderRequest.getLimit());
+        }
+        return invPlaceOrderDao.filterList(filterInvPlaceOrderRequest);
+    }
+
+    @Override
+    public BaseResponse addInvPlaceOrder(AddInvPlaceOrderRequest addInvPlaceOrderRequest) {
+        if (StrUtil.isBlank(addInvPlaceOrderRequest.getInvCode()) || StrUtil.isBlank(addInvPlaceOrderRequest.getInvSpaceCode()) || CollUtil.isEmpty(addInvPlaceOrderRequest.getCodeList()) || null == addInvPlaceOrderRequest.getType()) {
+            return ResultVOUtils.error(500, "参数错误");
+        }
+        if (addInvPlaceOrderRequest.getType().equals(2)) {
+            if (StrUtil.isBlank(addInvPlaceOrderRequest.getOrderId())) {
+                return ResultVOUtils.error(500, "参数错误");
+            }
+        }
+
+        //操作人ID
+        String userId = customerService.getUserIdStr();
+        //获取记录号
+        String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd"));
+
+        InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity();
+        orderEntity.setRecordId(recordId);
+        orderEntity.setType(addInvPlaceOrderRequest.getType());
+        orderEntity.setOrderId(addInvPlaceOrderRequest.getOrderId());
+        orderEntity.setCreateUser(userId);
+        orderEntity.setCreateTime(new Date());
+        orderEntity.setUpdateTime(new Date());
+
+        //生成物资上架详情
+        addInvPlaceOrderRequest.getCodeList().forEach(invProductDetailEntity -> {
+            InvPlaceOrderDetailEntity orderDetailEntity = new InvPlaceOrderDetailEntity();
+            orderDetailEntity.setInvCode(addInvPlaceOrderRequest.getInvCode());
+            orderDetailEntity.setInvSpaceCode(addInvPlaceOrderRequest.getInvSpaceCode());
+            orderDetailEntity.setRelId(String.valueOf(invProductDetailEntity.getRelId()));
+            orderDetailEntity.setCode(invProductDetailEntity.getCode());
+            orderDetailEntity.setBatchNo(invProductDetailEntity.getBatchNo());
+            orderDetailEntity.setRecordId(recordId);
+            invPlaceOrderDetailDao.insert(orderDetailEntity);
+        });
+
+        invPlaceOrderDao.insert(orderEntity);
+        return ResultVOUtils.success();
+    }
+}

src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java

@@ -11,10 +11,12 @@ import com.glxp.api.dao.auth.InvSpaceDao;
 import com.glxp.api.dao.auth.InvWarehouseDao;
 import com.glxp.api.dao.inv.InvProductDetailDao;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
+import com.glxp.api.req.inv.AddInvPlaceOrderRequest;
 import com.glxp.api.req.inv.FilterInvPlaceRequest;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inv.BindInvSpaceRequest;
 import com.glxp.api.res.inv.InvPlaceDetailResponse;
+import com.glxp.api.service.inv.InvPlaceOrderService;
 import com.glxp.api.service.inv.InvPlaceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -36,6 +38,8 @@ public class InvPlaceServiceImpl implements InvPlaceService {
     private InvWarehouseDao invWarehouseDao;
     @Resource
     private InvSpaceDao invSpaceDao;
+    @Resource
+    private InvPlaceOrderService invPlaceOrderService;
 
     @Override
     public List<InvPlaceDetailResponse> getPlaceDetailList(FilterInvPlaceRequest filterInvPlaceRequest) {
@@ -53,7 +57,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
         //查询仓库的部门ID
         String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
         List<InvProductDetailEntity> list = invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>()
-                .select("id")
+                .select("id", "code", "relId", "batchNo")
                 .eq("deptCode", deptCode)
                 .eq("invCode", bindInvSpaceRequest.getInvCode())
                 .in("code", bindInvSpaceRequest.getCodeArray())
@@ -62,6 +66,15 @@ public class InvPlaceServiceImpl implements InvPlaceService {
             List<Integer> ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList());
             log.info("本次绑定货位的库存详情数量为：{} 条", ids.size());
             invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode());
+
+            //添加物资上架记录
+            AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest();
+            addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType());
+            addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId());
+            addInvPlaceOrderRequest.setCodeList(list);
+            addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode());
+            addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+            invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest);
         } else {
             log.info("绑定货位列表查询无数据");
         }

src/main/java/com/glxp/api/util/GennerOrderUtils.java

@@ -45,6 +45,10 @@ public class GennerOrderUtils {
         return Constant.SERIAL_CACHE_PREFIX_STAT.concat(serialPrefix);
     }
 
+    private static String getInvPlaceCacheKey(String serialPrefix) {
+        return Constant.SERIAL_CACHE_PREFIX_PLACE.concat(serialPrefix);
+    }
+
     /**
      * 补全流水号
      *
@@ -152,7 +156,6 @@ public class GennerOrderUtils {
         return completionRandom(serialWithPrefix, orderNoTypeEnum);
     }
 
-
     public String createPurOrderNo(OrderNoTypeBean orderNoTypeEnum) {
         //获得单号前缀
         //格式 固定前缀 +时间前缀 示例
@@ -224,4 +227,30 @@ public class GennerOrderUtils {
         //补全随机数
         return completionRandom(serialWithPrefix, orderNoTypeEnum);
     }
+
+    /**
+     * 生成物资上架记录号
+     *
+     * @param orderNoTypeEnum
+     * @return
+     */
+    public String createInvPlaceOrderNo(OrderNoTypeBean orderNoTypeEnum) {
+        //获得单号前缀
+        //格式 固定前缀 +时间前缀 示例
+        String formNoPrefix = getFormNoPrefix(orderNoTypeEnum);
+        //获得缓存key
+        String cacheKey = getStatCacheKey(formNoPrefix);
+        //获得当日自增数
+        Long incrementalSerial = redisUtil.incr(cacheKey, 1);
+        // 设置key过期时间, 保证每天的流水号从1开始
+        if (incrementalSerial == 1) {
+            //设置失效时间 凌晨过期
+            redisUtil.expire(cacheKey, getSecondsNextEarlyMorning());
+        }
+        //组合单号并补全流水号
+        String serialWithPrefix = completionSerial(formNoPrefix, incrementalSerial, orderNoTypeEnum);
+        //补全随机数
+        return completionRandom(serialWithPrefix, orderNoTypeEnum);
+    }
+
 }

src/main/resources/application-test.yml

@@ -44,6 +44,7 @@ logging:
     com.glxp.api.dao: debug
 
 file_path: /udi/udiwms/udiwmsfile/
+back_file_path: /share/udisps/back/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

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

@@ -0,0 +1,70 @@
+<?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.inv.InvPlaceOrderDao">
+    <select id="filterList" resultType="com.glxp.api.res.inv.InvPlaceOrderResponse">
+        select t.recordId,
+               t.type,
+               t.orderId,
+               t2.invCode,
+               t2.invSpaceCode,
+               t.createUser,
+               (select employeeName from auth_user where id = t.createUser) operatorName,
+               (select name from auth_warehouse where code = t2.invCode)    invName,
+               (select name from auth_space where code = t2.invSpaceCode)   invSpaceName,
+               t.createTime,
+               t2.code,
+               t2.batchNo,
+               t2.relId,
+               bp.cpmctymc                                                  productName,
+               bp.ggxh,
+               pd.produceDate                                               productionDate,
+               pd.expireDate,
+               bp.nameCode,
+               bp.zczbhhzbapzbh,
+               bp.ylqxzcrbarmc,
+               (select name from basic_corp where erpId = pd.supId)         supName,
+               pd.serialNo,
+               bp.manufactory,
+               bp.measname
+        from inv_place_order t
+                 right join inv_place_order_detail t2 on t.recordId = t2.recordId
+                 left join inv_product_detail pd
+                           on t2.invCode = pd.invCode and t2.invSpaceCode = pd.invSpaceCode and t2.relId = pd.relId
+                               and t2.code = pd.code
+                 left join basic_udirel bu on bu.id = t2.relId
+                 left join basic_products bp on bp.uuid = bu.uuid
+        <where>
+            <if test="recordId != null and recordId != ''">
+                and t.recordId like concat('%', #{recordId}, '%')
+            </if>
+            <if test="invCode != null and invCode != ''">
+                and t2.invCode = #{invCode}
+            </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                and t2.invSpaceCode = #{invSpaceCode}
+            </if>
+            <if test="type != null">
+                and t.type = #{type}
+            </if>
+            <if test="orderId != null and orderId != ''">
+                and t.orderId like concat('%', #{orderId}, '%')
+            </if>
+            <if test="code != null and code != ''">
+                and t2.code like concat('%', #{code}, '%')
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                and bp.nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="productName != null and productName != ''">
+                and bp.cpmctymc like concat('%', #{productName}, '%')
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                and t2.batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
+                and bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+        </where>
+        group by t2.code
+    </select>
+</mapper>

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

@@ -0,0 +1,4 @@
+<?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.inv.InvPlaceOrderDetailDao">
+</mapper>

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

@@ -117,6 +117,9 @@
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND pd.invSpaceCode = #{invSpaceCode}
             </if>
+            <if test="invSpaceCode == null  or invSpaceCode == ''">
+                AND (pd.invSpaceCode is null or pd.invSpaceCode = '')
+            </if>
         </where>
         group by pd.code
     </select>

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

@@ -127,10 +127,12 @@ INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`,
 VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1);
 INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
                                     `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
-VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1);
+VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2,
+        1);
 INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
                                     `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
-VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1);
+VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3,
+        1);
 
 
 CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);
@@ -341,6 +343,39 @@ CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2);
 
+CREATE TABLE IF NOT EXISTS `inv_place_order`
+(
+    `id`           int                                                           NOT NULL AUTO_INCREMENT,
+    `recordId`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上架记录号',
+    `type`         tinyint                                                       NULL DEFAULT NULL COMMENT '上架方式 1：按物资上架  2：按单上架',
+    `orderId`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据号',
+    `createUser`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作人',
+    `createTime`   datetime                                                      NULL DEFAULT NULL COMMENT '上架时间',
+    `updateTime`   datetime                                                      NULL DEFAULT NULL COMMENT '更新时间',
+    `remark`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '上架记录表'
+  ROW_FORMAT = Dynamic;
+
+CREATE TABLE IF NOT EXISTS `inv_place_order_detail`
+(
+    `id`       int                                                           NOT NULL AUTO_INCREMENT,
+    `recordId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上架记录号',
+    `invCode`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库号',
+    `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位号',
+    `code`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'UDI码',
+    `relId`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '物资编码',
+    `batchNo`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
+    `count`    int                                                           NULL DEFAULT NULL COMMENT '数量',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '上架记录详情表'
+  ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
 
 
 CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2);