1.调整摆放功能代码

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

@@ -6,6 +6,7 @@ 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.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.InvPlaceService;
@@ -68,4 +69,32 @@ public class InvPlaceController {
         return invPlaceService.checkCodeSpace(bindInvSpaceRequest);
     }
 
+    /**
+     * 查询库存产品信息
+     *
+     * @param filterInvPlaceRequest
+     * @return
+     */
+    @GetMapping("/spms/inv/product/getInvProductInfo")
+    private BaseResponse getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) {
+        List<InvPlaceDetailResponse> list = invPlaceService.getInvProductInfo(filterInvPlaceRequest);
+        return ResultVOUtils.success(list);
+    }
+
+    /**
+     * 从库存详情查询单据列表
+     *
+     * @param filterInvPlaceRequest
+     * @return
+     */
+    @GetMapping("/spms/inv/product/getInvPlaceOrderList")
+    public BaseResponse getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest) {
+        if (null == filterInvPlaceRequest || StrUtil.isBlank(filterInvPlaceRequest.getInvCode())) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<IoOrderResponse> list = invPlaceService.getInvPlaceOrderList(filterInvPlaceRequest);
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
 }

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

@@ -4,6 +4,7 @@ import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.req.inv.FilterInvPlaceRequest;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inv.BindInvSpaceRequest;
 import com.glxp.api.res.inv.InvPlaceDetailResponse;
 import org.apache.ibatis.annotations.Mapper;
@@ -72,4 +73,20 @@ public interface InvProductDetailDao extends BaseMapperPlus<InvProductDetailDao,
      * @return
      */
     List<String> selectCountOrderCodes(@Param("invCode") String invCode, @Param("invSpaceCode") String invSpaceCode, @Param("relId") Long relId, @Param("batchNo") String batchNo);
+
+    /**
+     * 查询库存摆放的产品详情数据
+     *
+     * @param filterInvPlaceRequest
+     * @return
+     */
+    List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest);
+
+    /**
+     * 从单据详情查询摆放页面的单据列表数据
+     *
+     * @param filterInvPlaceRequest
+     * @return
+     */
+    List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
 }

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

@@ -24,4 +24,14 @@ public class FilterInvPlaceRequest extends ListPageRequest {
      */
     private String invSpaceCode;
 
+    /**
+     * UDI码
+     */
+    private String code;
+
+    /**
+     * 单据号
+     */
+    private String orderId;
+
 }

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

@@ -98,4 +98,24 @@ public class InvPlaceDetailResponse {
      */
     private String invSpaceName;
 
+    /**
+     * 供应商名称
+     */
+    private String supName;
+
+    /**
+     * 序列号
+     */
+    private String serialNo;
+
+    /**
+     * 计量单位
+     */
+    private String measname;
+
+    /**
+     * 生产厂家
+     */
+    private String manufactory;
+
 }

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

@@ -2,6 +2,7 @@ package com.glxp.api.service.inv;
 
 import com.glxp.api.common.res.BaseResponse;
 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;
 
@@ -34,4 +35,18 @@ public interface InvPlaceService {
      * @return
      */
     BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest);
+
+    /**
+     * @param filterInvPlaceRequest
+     * @return
+     */
+    List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest);
+
+    /**
+     * 从库存详情查询单据列表
+     *
+     * @param filterInvPlaceRequest
+     * @return
+     */
+    List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
 }

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

@@ -12,6 +12,7 @@ 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.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.InvPlaceService;
@@ -82,4 +83,20 @@ public class InvPlaceServiceImpl implements InvPlaceService {
         }
         return ResultVOUtils.success();
     }
+
+    @Override
+    public List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) {
+        return invProductDetailDao.getInvProductInfo(filterInvPlaceRequest);
+    }
+
+    @Override
+    public List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest) {
+        if (null == filterInvPlaceRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterInvPlaceRequest.getPage() && null != filterInvPlaceRequest.getLimit()) {
+            PageHelper.offsetPage((filterInvPlaceRequest.getPage() - 1) * filterInvPlaceRequest.getLimit(), filterInvPlaceRequest.getLimit());
+        }
+        return invProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest);
+    }
 }

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

@@ -161,4 +161,61 @@
             </if>
         </where>
     </select>
+
+    <select id="getInvProductInfo" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
+        select ipd.code,
+               ipd.relId,
+               ipd.batchNo,
+               ipd.serialNo,
+               ipd.invSpaceCode,
+               ipd.invCode,
+               bp.cpmctymc                                                     productName,
+               bp.ggxh,
+               bp.measname,
+               bp.zczbhhzbapzbh,
+               bp.manufactory,
+               (select name from auth_space s where s.code = ipd.invSpaceCode) invSpaceName,
+               (select name from basic_corp bc where bc.erpId = ipd.supId)     supName
+        from inv_product_detail ipd
+                 left join basic_udirel bu on bu.id = ipd.relId
+                 left join basic_products bp on bp.uuid = bu.uuid
+        <where>
+            <if test="invCode != null and invCode != ''">
+                AND ipd.invCode = #{invCode}
+            </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                AND ipd.invSpaceCode = #{invSpaceCode}
+            </if>
+            <if test="code != null and code != ''">
+                AND ipd.code = #{code}
+            </if>
+            <if test="orderId != null and orderId != ''">
+                AND ipd.orderId = #{orderId}
+            </if>
+        </where>
+        group by ipd.id
+    </select>
+
+    <select id="getInvPlaceOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
+        select ipd.orderId                                                     billNo,
+               (select name from basic_bussiness_type where action = o.action) billTypeName,
+               o.mainAction,
+               o.fromCorp,
+               o.corpOrderId,
+               o.fromType,
+               o.createTime,
+               o.auditTime,
+               (select employeeName from auth_user where id = o.reviewUser) reviewUserName
+        from inv_product_detail ipd
+                 left join io_order o on ipd.orderId = o.billNo
+        <where>
+            <if test="invCode != null and invCode != ''">
+                AND ipd.invCode = #{invCode}
+            </if>
+            <if test="orderId != null and orderId != ''">
+                AND ipd.orderId like concat('%', #{orderId}, '%')
+            </if>
+        </where>
+        group by ipd.orderId
+    </select>
 </mapper>