1.修改盘点单据详情字段名称

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderDetailController.java

@@ -1,9 +1,9 @@
 package com.glxp.api.admin.controller.inventory;
 
 import com.github.pagehelper.PageInfo;
-import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
 import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse;
 import com.glxp.api.admin.service.inventory.InvCountOrderDetailService;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -31,9 +31,9 @@ public class InvCountOrderDetailController {
      */
     @GetMapping("/invCount/order/detail/filter")
     public BaseResponse filterList(FilterInvCountOrderDetailRequest detailRequest) {
-        List<InvCountOrderDetail> list = invCountOrderDetailService.filterList(detailRequest);
+        List<InvCountOrderDetailResponse> list =  invCountOrderDetailService.filterCountDetail(detailRequest);
-        PageInfo<InvCountOrderDetail> pageInfo = new PageInfo<>(list);
+        PageInfo<InvCountOrderDetailResponse> pageInfo = new PageInfo<>(list);
-        PageSimpleResponse<InvCountOrderDetail> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<InvCountOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(pageInfo.getList());
         return ResultVOUtils.success(pageSimpleResponse);

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDetailDao.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.dao.inventory;
 
 import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
 import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
+import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -48,4 +49,13 @@ public interface InvCountOrderDetailDao {
      * @return
      */
     Long countByOrderIdFk(@Param("orderIdFk") Integer orderIdFk);
+
+    /**
+     * 查询盘点单据详情
+     *
+     * @param detailRequest
+     * @return
+     */
+    List<InvCountOrderDetailResponse> filterCountDetail(FilterInvCountOrderDetailRequest detailRequest);
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrderDetail.java

@@ -48,7 +48,7 @@ public class InvCountOrderDetail {
     /**
      * 账面数量
      */
-    private Integer bookNum;
+    private Integer invNum;
 
     /**
      * 盘盈数量

api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountOrderDetailResponse.java

@@ -0,0 +1,17 @@
+package com.glxp.api.admin.res.inventory;
+
+import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
+import lombok.Data;
+
+/**
+ * 盘点单据详情实体类
+ */
+@Data
+public class InvCountOrderDetailResponse extends InvCountOrderDetail {
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderDetailService.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.service.inventory;
 
 import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
 import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
+import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse;
 
 import java.util.List;
 
@@ -11,4 +12,11 @@ import java.util.List;
 public interface InvCountOrderDetailService {
 
     List<InvCountOrderDetail> filterList(FilterInvCountOrderDetailRequest detailRequest);
+
+    /**
+     * 查询盘点单据详情
+     *
+     * @return
+     */
+    List<InvCountOrderDetailResponse> filterCountDetail(FilterInvCountOrderDetailRequest detailRequest);
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderDetailServiceImpl.java

@@ -4,6 +4,8 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao;
 import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
 import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
+import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse;
+import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
 import com.glxp.api.admin.service.inventory.InvCountOrderDetailService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -31,4 +33,15 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic
         }
         return invCountOrderDetailDao.filterList(detailRequest);
     }
+
+    @Override
+    public List<InvCountOrderDetailResponse> filterCountDetail(FilterInvCountOrderDetailRequest detailRequest) {
+        if (null == detailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != detailRequest.getPage() && null != detailRequest.getLimit()) {
+            PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit());
+        }
+        return invCountOrderDetailDao.filterCountDetail(detailRequest);
+    }
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java

@@ -83,7 +83,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
             InvCountOrderDetail countOrderDetail = new InvCountOrderDetail();
             BeanUtil.copyProperties(invProductEntity, countOrderDetail);
             countOrderDetail.setOrderIdFk(String.valueOf(invCountOrder.getId()));
-            countOrderDetail.setBookNum(invProductEntity.getInCount() - invProductEntity.getOutCount());
+            countOrderDetail.setInvNum(invProductEntity.getInCount() - invProductEntity.getOutCount());
             countOrderDetail.setProduceDate(invProductEntity.getProductionDate());
             countOrderDetail.setProductId(invProductEntity.getRelIdFk());
             invCountOrderDetailDao.insert(countOrderDetail);

api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml

@@ -10,7 +10,7 @@
         <result column="expireDate" jdbcType="VARCHAR" property="expireDate"/>
         <result column="serialNo" jdbcType="VARCHAR" property="serialNo"/>
         <result column="countNum" jdbcType="INTEGER" property="countNum"/>
-        <result column="bookNum" jdbcType="INTEGER" property="bookNum"/>
+        <result column="invNum" jdbcType="INTEGER" property="invNum"/>
         <result column="profitNum" jdbcType="INTEGER" property="profitNum"/>
         <result column="lossNum" jdbcType="INTEGER" property="lossNum"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
@@ -25,7 +25,7 @@
         expireDate,
         serialNo,
         countNum,
-        bookNum,
+        invNum,
         profitNum,
         lossNum,
         `status`
@@ -48,11 +48,11 @@
             parameterType="com.glxp.api.admin.entity.inventory.InvCountOrderDetail" useGeneratedKeys="true">
         insert into inv_count_order_detail (orderIdFk, productId, batchNo,
                                             produceDate, expireDate, serialNo,
-                                            countNum, bookNum, profitNum,
+                                            countNum, invNum, profitNum,
                                             lossNum, `status`)
         values (#{orderIdFk,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR},
                 #{produceDate,jdbcType=VARCHAR}, #{expireDate,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR},
-                #{countNum,jdbcType=INTEGER}, #{bookNum,jdbcType=INTEGER}, #{profitNum,jdbcType=INTEGER},
+                #{countNum,jdbcType=INTEGER}, #{invNum,jdbcType=INTEGER}, #{profitNum,jdbcType=INTEGER},
                 #{lossNum,jdbcType=INTEGER}, #{status,jdbcType=INTEGER})
     </insert>
 
@@ -81,8 +81,8 @@
             <if test="countNum != null">
                 countNum,
             </if>
-            <if test="bookNum != null">
+            <if test="invNum != null">
-                bookNum,
+                invNum,
             </if>
             <if test="profitNum != null">
                 profitNum,
@@ -116,8 +116,8 @@
             <if test="countNum != null">
                 #{countNum,jdbcType=INTEGER},
             </if>
-            <if test="bookNum != null">
+            <if test="invNum != null">
-                #{bookNum,jdbcType=INTEGER},
+                #{invNum,jdbcType=INTEGER},
             </if>
             <if test="profitNum != null">
                 #{profitNum,jdbcType=INTEGER},
@@ -155,8 +155,8 @@
             <if test="countNum != null">
                 countNum = #{countNum,jdbcType=INTEGER},
             </if>
-            <if test="bookNum != null">
+            <if test="invNum != null">
-                bookNum = #{bookNum,jdbcType=INTEGER},
+                invNum = #{invNum,jdbcType=INTEGER},
             </if>
             <if test="profitNum != null">
                 profitNum = #{profitNum,jdbcType=INTEGER},
@@ -180,7 +180,7 @@
             expireDate  = #{expireDate,jdbcType=VARCHAR},
             serialNo    = #{serialNo,jdbcType=VARCHAR},
             countNum    = #{countNum,jdbcType=INTEGER},
-            bookNum     = #{bookNum,jdbcType=INTEGER},
+            invNum      = #{invNum,jdbcType=INTEGER},
             profitNum   = #{productId,jdbcType=INTEGER},
             lossNum     = #{lossNum,jdbcType=INTEGER},
             `status`    = #{status,jdbcType=INTEGER}
@@ -225,9 +225,9 @@
                     when id = #{item.id,jdbcType=INTEGER} then #{item.countNum,jdbcType=INTEGER}
                 </foreach>
             </trim>
-            <trim prefix="bookNum = case" suffix="end,">
+            <trim prefix="invNum = case" suffix="end,">
                 <foreach collection="list" index="index" item="item">
-                    when id = #{item.id,jdbcType=INTEGER} then #{item.bookNum,jdbcType=INTEGER}
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.invNum,jdbcType=INTEGER}
                 </foreach>
             </trim>
             <trim prefix="profitNum = case" suffix="end,">
@@ -254,13 +254,13 @@
 
     <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
         insert into inv_count_order_detail
-        (orderIdFk, productId, batchNo, produceDate, expireDate, serialNo, countNum, bookNum,
+        (orderIdFk, productId, batchNo, produceDate, expireDate, serialNo, countNum, invNum,
          profitNum, lossNum, `status`)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.orderIdFk,jdbcType=VARCHAR}, #{item.productId,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR},
              #{item.produceDate,jdbcType=VARCHAR}, #{item.expireDate,jdbcType=VARCHAR},
-             #{item.serialNo,jdbcType=VARCHAR}, #{item.countNum,jdbcType=INTEGER}, #{item.bookNum,jdbcType=INTEGER},
+             #{item.serialNo,jdbcType=VARCHAR}, #{item.countNum,jdbcType=INTEGER}, #{item.invNum,jdbcType=INTEGER},
              #{item.profitNum,jdbcType=INTEGER}, #{item.lossNum,jdbcType=INTEGER}, #{item.status,jdbcType=INTEGER})
         </foreach>
     </insert>
@@ -279,6 +279,26 @@
     </select>
 
     <select id="countByOrderIdFk" resultType="java.lang.Long">
-        select count(*) from inv_count_order_detail where orderIdFk = #{orderIdFk}
+        select count(*)
+        from inv_count_order_detail
+        where orderIdFk = #{orderIdFk}
+    </select>
+
+    <select id="filterCountDetail" resultType="com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse">
+        select od.id,
+               orderIdFk,
+               productId,
+               batchNo,
+               produceDate,
+               expireDate,
+               serialNo,
+               countNum,
+               invNum,
+               profitNum,
+               lossNum,
+               status,
+               p.cpmctymc productName
+        from inv_count_order_detail od
+                 left join basic_products p on od.productId = p.id
     </select>
 </mapper>