盘点相关功能--盘点方式，部分盘点修改

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

@@ -33,12 +33,13 @@ public class InvCountCodesController {
     /**
      * 查询码表
      *
-     * @param codesRequest
      * @return
      */
     @Log(title = "查询码表")
     @GetMapping("/invCount/codes/filter")
     public BaseResponse filterList(FilterInvCountCodesRequest codesRequest) {
+        if (StrUtil.isEmpty(codesRequest.getOrderIdFk()))
+            return ResultVOUtils.error(500, "盘点单号不能为空！");
         List<InvCountCodesEntity> list = invCountCodesService.filterList(codesRequest);
         PageInfo<InvCountCodesEntity> pageInfo = new PageInfo<>(list);
         PageSimpleResponse<InvCountCodesEntity> pageSimpleResponse = new PageSimpleResponse<>();

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

@@ -41,6 +41,8 @@ public class InvCountOrderDetailController {
     @Log(title = "查询盘点单据详情")
     @GetMapping("/invCount/order/detail/filter")
     public BaseResponse filterList(FilterInvCountOrderDetailRequest detailRequest) {
+        if (StrUtil.isEmpty(detailRequest.getOrderIdFk()))
+            return ResultVOUtils.error(500, "盘点单号不能为空！");
         List<InvCountOrderDetailResponse> list = invCountOrderDetailService.filterCountDetail(detailRequest);
         PageInfo<InvCountOrderDetailResponse> pageInfo = new PageInfo<>(list);
         PageSimpleResponse<InvCountOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();

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

@@ -297,7 +297,7 @@ public class InvProductController extends BaseController {
         if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        List<InvProductResponse> list = invProductService.getCountInvProduct(filterInvProductRequest);
+        List<InvProductResponse> list = invProductService.filterList(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }

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

@@ -130,5 +130,12 @@ public class InvCountOrderEntity implements Serializable {
     @ApiModelProperty(value = "盘点类型，0：整库盘点 1：按货位盘点 2：部分盘点")
     private Integer countType;
 
+    /**
+     * 盘点方式
+     */
+    @TableField(value = "codeCount")
+    @ApiModelProperty(value = "盘点方式，1：手动盘点 1：扫码盘点")
+    private Integer codeCount;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -24,9 +24,8 @@
         where orderIdFk = #{orderId}
     </delete>
 
-    <select id="filterList" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
+    <select id="filterList" resultType="com.glxp.api.entity.inv.InvCountCodesEntity">
+        select *
         from inv_count_codes
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">

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

@@ -28,21 +28,7 @@
 
 
     <select id="selectList" resultType="com.glxp.api.res.inv.InvCountOrderResponse">
-        select co.id,
-               co.orderId,
-               co.invStorageCode,
-               co.invWarehouseCode,
-               co.deptCode,
-               co.createUser,
-               co.createTime,
-               co.updateTime,
-               co.auditUser,
-               co.auditTime,
-               co.status,
-               co.remark,
-               co.inOrderIds,
-               co.outOrderIds,
-               co.countType,
+        select co.*,
                ws.name          as invStorageName,
                sp.name          as invSpaceName,
                ad.name          as deptName,
@@ -109,7 +95,7 @@
         where orderId = #{orderId}
     </update>
 
-    <select id="selectByOrderId" resultMap="BaseResultMap">
+    <select id="selectByOrderId" resultType="com.glxp.api.entity.inv.InvCountOrderEntity">
         select *
         from inv_count_order
         where orderId = #{orderId}

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

@@ -995,3 +995,5 @@ CALL Pro_Temp_ColumnWork('inv_count_codes', 'nameCode', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_count_codes', 'produceDate', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_count_codes', 'expireDate', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_count_codes', 'serialNo', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_count_order', 'codeCount', 'varchar(255)', 1);
+