1.盘点单据添加盘点类型字段

2.增加盘点单据页面库存查询接口
2 years ago · c83ed9c741
parent 8db9405557
commit c83ed9c741
9 changed files with 104 additions and 10 deletions
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java
@ -478,4 +478,20 @@ public class InvProductsController {
        return invProductDetailService.checkCodeSpace(bindInvSpaceRequest);
    }

+    /**
+     * 盘点单据查询库存产品接口
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/products/getCountInvProductProduct")
+    public BaseResponse getCountInvProductProduct(FilterInvProductRequest filterInvProductRequest) {
+        if (StrUtil.isBlank(filterInvProductRequest.getInvStorageCode()) || StrUtil.isBlank(filterInvProductRequest.getInvWarehouseCode())) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<InvProductResponse> list = invProductService.getCountInvProductProduct(filterInvProductRequest);
+        return ResultVOUtils.success(list);
+    }
+
 }
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDao.java
@ -54,4 +54,10 @@ public interface InvProductDao {
     */
    InvProductEntity selectProductInfo(@Param("productId") String productId, @Param("batchNo") String batchNo, @Param("invStorageCode") String invStorageCode, @Param("invWarehouseCode") String invWarehouseCode);

+    /**
+     * 盘点单据查询库存产品
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> getCountInvProduct(FilterInvProductRequest filterInvProductRequest);
 }
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrder.java
@ -75,4 +75,9 @@ public class InvCountOrder {
     */
    private String outOrderIds;

+    /**
+     * 盘点类型，0：整库盘点 1：按货位盘点 2：部分盘点
+     */
+    private Integer countType;
+
 }
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java
@ -32,8 +32,11 @@ public class FilterInvProductRequest extends ListPageRequest {
    private String unitFk;
    //仓位码
    private String invStorageCode;
-    //货位码
+    //分库码
    private String invWarehouseCode;
+    //货位码
+    private String invSpaceCode;
+
    private String groupType;

    private List<String> invCodes;
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductService.java
@ -36,4 +36,13 @@ public interface InvProductService {
     * @return
     */
    Integer countByWarehouseCode(String warehouseCode, String subWarehouseCode);
+
+    /**
+     * 盘点单据查询库存产品信息列表
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> getCountInvProductProduct(FilterInvProductRequest filterInvProductRequest);
+
 }
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java
@ -143,4 +143,10 @@ public class InvProductServiceImpl implements InvProductService {
    public Integer countByWarehouseCode(String warehouseCode, String subWarehouseCode) {
        return invProductDao.countByWarehouseCode(warehouseCode, subWarehouseCode);
    }
+
+    @Override
+    public List<InvProductResponse> getCountInvProductProduct(FilterInvProductRequest filterInvProductRequest) {
+        return invProductDao.getCountInvProduct(filterInvProductRequest);
+    }
+
 }
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml
@ -12,10 +12,11 @@
        <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
        <result column="auditUser" jdbcType="VARCHAR" property="auditUser"/>
        <result column="auditTime" jdbcType="TIMESTAMP" property="auditTime"/>
-        <result column="status" jdbcType="BOOLEAN" property="status"/>
+        <result column="status" jdbcType="TINYINT" property="status"/>
        <result column="remark" jdbcType="VARCHAR" property="remark"/>
        <result column="inOrderIds" jdbcType="VARCHAR" property="inOrderIds"/>
        <result column="outOrderIds" jdbcType="VARCHAR" property="outOrderIds"/>
+        <result column="countType" jdbcType="TINYINT" property="countType"/>
    </resultMap>

    <sql id="Base_Column_List">
@ -32,7 +33,8 @@
        `status`,
        remark,
        inOrderIds,
-        outOrderIds
+        outOrderIds,
+        countType
    </sql>

    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@ -53,12 +55,12 @@
        insert into inv_count_order (orderId, invStorageCode,
                                     invWarehouseCode, invSpaceCode, `createUser`,
                                     createTime, updateTime, auditUser,
-                                     auditTime, `status`, remark, inOrderIds, outOrderIds)
+                                     auditTime, `status`, remark, inOrderIds, outOrderIds, countType)
        values (#{orderId,jdbcType=VARCHAR}, #{invStorageCode,jdbcType=VARCHAR},
                #{invWarehouseCode,jdbcType=VARCHAR}, #{invSpaceCode,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR},
                #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{auditUser,jdbcType=VARCHAR},
                #{auditTime,jdbcType=TIMESTAMP}, #{status,jdbcType=BOOLEAN}, #{remark,jdbcType=VARCHAR},
-                #{inOrderIds,jdbcType=VARCHAR}, #{outOrderIds,jdbcType=VARCHAR})
+                #{inOrderIds,jdbcType=VARCHAR}, #{outOrderIds,jdbcType=VARCHAR}, #{countType,jdbcType=TINYINT})
    </insert>

    <insert id="insertSelective" parameterType="com.glxp.api.admin.entity.inventory.InvCountOrder">
@ -106,6 +108,9 @@
            <if test="outOrderIds != null and outOrderIds != ''">
                outOrderIds,
            </if>
+            <if test="countType != null">
+                countType,
+            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">
@ -150,6 +155,9 @@
            <if test="outOrderIds != null and outOrderIds != ''">
                #{outOrderIds,jdbcType=VARCHAR},
            </if>
+            <if test="countType != null">
+                #{countType,jdbcType=TINYINT},
+            </if>
        </trim>
    </insert>

@ -195,6 +203,9 @@
            <if test="outOrderIds != null and outOrderIds != ''">
                outOrderIds = #{outOrderIds,jdbcType=VARCHAR},
            </if>
+            <if test="countType != null">
+                countType = #{countType,jdbcType=INTEGER},
+            </if>
        </set>
        where id = #{id,jdbcType=INTEGER}
    </update>
@ -213,7 +224,8 @@
            `status`         = #{status,jdbcType=BOOLEAN},
            remark           = #{remark,jdbcType=VARCHAR},
            inOrderIds       = #{inOrderIds,jdbcType=VARCHAR},
-            outOrderIds      = #{outOrderIds,jdbcType=VARCHAR}
+            outOrderIds      = #{outOrderIds,jdbcType=VARCHAR},
+            countType        = #{countType,jdbcType=INTEGER}
        where id = #{id,jdbcType=INTEGER}
    </update>

@ -285,6 +297,11 @@
                    when id = #{item.id,jdbcType=INTEGER} then #{item.outOrderIds,jdbcType=VARCHAR}
                </foreach>
            </trim>
+            <trim prefix="countType = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.countType,jdbcType=INTEGER}
+                </foreach>
+            </trim>
        </trim>
        where id in
        <foreach close=")" collection="list" item="item" open="(" separator=", ">
@ -295,7 +312,7 @@
    <insert id="batchInsert" parameterType="map">
        insert into inv_count_order
        (id, orderId, invStorageCode, invWarehouseCode, invSpaceCode, `createUser`, createTime,
-         updateTime, auditUser, auditTime, `status`, remark, inOrderIds, outOrderIds)
+         updateTime, auditUser, auditTime, `status`, remark, inOrderIds, outOrderIds, countType)
        values
        <foreach collection="list" item="item" separator=",">
            (#{item.id,jdbcType=INTEGER}, #{item.orderId,jdbcType=VARCHAR}, #{item.invStorageCode,jdbcType=VARCHAR},
@ -303,7 +320,8 @@
             #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
             #{item.updateTime,jdbcType=TIMESTAMP},
             #{item.auditUser,jdbcType=VARCHAR}, #{item.auditTime,jdbcType=TIMESTAMP}, #{item.status,jdbcType=BOOLEAN},
-             #{item.remark,jdbcType=VARCHAR}, #{item.inOrderIds,jdbcType=VARCHAR}, #{item.outOrderIds,jdbcType=VARCHAR})
+             #{item.remark,jdbcType=VARCHAR}, #{item.inOrderIds,jdbcType=VARCHAR}, #{item.outOrderIds,jdbcType=VARCHAR},
+             #{item.countType,jdbcType=INTEGER})
        </foreach>
    </insert>

@ -322,6 +340,7 @@
               co.remark,
               co.inOrderIds,
               co.outOrderIds,
+               co.countType,
               w.name  as invStorageName,
               ws.name as invSubStorageName,
               sp.name as invSpaceName
@ -381,7 +400,8 @@
            `status`         = #{status,jdbcType=BOOLEAN},
            remark           = #{remark,jdbcType=VARCHAR},
            inOrderIds       = #{inOrderIds,jdbcType=VARCHAR},
-            outOrderIds      = #{outOrderIds,jdbcType=VARCHAR}
+            outOrderIds      = #{outOrderIds,jdbcType=VARCHAR},
+            countType        = #{countType,jdbcType=INTEGER}
        where orderId = #{orderId}
    </update>

--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@ -366,4 +366,32 @@
          and invStorageCode = #{invStorageCode}
          and invWarehouseCode = #{invWarehouseCode}
    </select>
+
+    <select id="getCountInvProduct" resultType="com.glxp.api.admin.res.inventory.InvProductResponse">
+        select inv_product.relIdFk,
+               inv_product.nameCode,
+               inv_product.batchNo,
+               inv_product.productionDate,
+               inv_product.expireDate,
+               inv_product.inCount,
+               inv_product.outCount,
+               inv_product.ggxh,
+               basic_products.cpmctymc
+        from inv_product_detail
+                 left join inv_product on inv_product_detail.productIdFk = inv_product.relIdFk
+                 left join basic_udirel on inv_product_detail.productIdFk = basic_udirel.id
+                 left join basic_products on basic_products.uuid = basic_udirel.uuid
+        <where>
+            <if test="invStorageCode != null and invStorageCode != ''">
+                AND inv_product_detail.invStorageCode = #{invStorageCode}
+            </if>
+            <if test="invWarehouseCode != null and invWarehouseCode != ''">
+                AND inv_product_detail.invWarehouseCode = #{invWarehouseCode}
+            </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                AND inv_product_detail.invSpaceCode = #{invSpaceCode}
+            </if>
+        </where>
+        group by inv_product_detail.productIdFk, inv_product.batchNo
+    </select>
 </mapper>
--- a/scripts/盘点功能表.sql
+++ b/scripts/盘点功能表.sql
@ -26,8 +26,9 @@ CREATE TABLE `inv_count_order`  (
                                    `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注字段',
                                    `inOrderIds` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '入库扫码单据号，多个使用 , 隔开',
                                    `outOrderIds` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '出库扫码单据号，多个使用 , 隔开',
+                                    `countType` tinyint(1) NULL DEFAULT NULL COMMENT '盘点类型，0：整库盘点 1：按货位盘点 2：部分盘点',
                                    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '盘点单据表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '盘点单据表' ROW_FORMAT = Dynamic;

 SET FOREIGN_KEY_CHECKS = 1;