1.盘点单据查询接口添加盘点单号参数

2.添加手持终端提交盘点单据接口

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

@@ -2,9 +2,11 @@ package com.glxp.api.admin.controller.inventory;
 
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.entity.inventory.InvCountOrder;
 import com.glxp.api.admin.req.inout.DeleteRequest;
 import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
+import com.glxp.api.admin.req.inventory.FilterInvCountOrderSaveRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
 import com.glxp.api.admin.service.inventory.InvCountOrderService;
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -102,4 +105,21 @@ public class InvCountOrderController {
         return invCountOrderService.updateCountOrderStatus(filterInvCountOrderRequest.getId(), filterInvCountOrderRequest.getStatus());
     }
 
+
+    //------------------------------------------------------手持终端接口---------------------------------------------------------------
+
+    /**
+     * 手持终端新增盘点单据接口
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/invCount/order/saveCountOrderForPDA")
+    public BaseResponse saveCountOrderForPDA(@RequestBody @Valid FilterInvCountOrderSaveRequest filterInvCountOrderSaveRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        return invCountOrderService.saveCountOrderForPDA(filterInvCountOrderSaveRequest);
+    }
+
 }

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderRequest.java

@@ -11,6 +11,11 @@ public class FilterInvCountOrderRequest extends ListPageRequest {
      */
     private String id;
 
+    /**
+     * 盘点单号
+     */
+    private String orderId;
+
     /**
      * 仓库码
      */

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderSaveRequest.java

@@ -0,0 +1,67 @@
+package com.glxp.api.admin.req.inventory;
+
+import com.glxp.api.admin.entity.inventory.InvCountCodes;
+import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 手持终端盘点单据保存接口参数
+ */
+@Data
+public class FilterInvCountOrderSaveRequest {
+
+    /**
+     * 盘点单号
+     */
+    @NotBlank(message = "盘点单号为空")
+    private String orderId;
+
+    /**
+     * 仓库号
+     */
+    private String invStorageCode;
+
+    /**
+     * 分库号
+     */
+    private String invWarehouseCode;
+
+    /**
+     * 货位号
+     */
+    private String invSpaceCode;
+
+    /**
+     * 盘点用户ID
+     */
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 状态 0：未提交 1：未审核 2：已审核
+     */
+    private Integer status;
+
+    /**
+     * 盘点类型，0：整库盘点 1：按货位盘点 2：部分盘点
+     */
+    private Integer countType;
+
+    /**
+     * 单据详情
+     */
+    private List<InvCountOrderDetail> countOrderDetailList;
+
+    /**
+     * 条码
+     */
+    private List<InvCountCodes> countCodeList;
+
+}

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

@@ -2,6 +2,7 @@ package com.glxp.api.admin.service.inventory;
 
 import com.glxp.api.admin.entity.inventory.InvCountOrder;
 import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
+import com.glxp.api.admin.req.inventory.FilterInvCountOrderSaveRequest;
 import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
 import com.glxp.api.common.res.BaseResponse;
 
@@ -50,4 +51,12 @@ public interface InvCountOrderService {
      * @return
      */
     BaseResponse updateCountOrderStatus(String id, Integer status);
+
+    /**
+     * 手持终端保存盘点单据
+     *
+     * @param filterInvCountOrderSaveRequest
+     * @return
+     */
+    BaseResponse saveCountOrderForPDA(FilterInvCountOrderSaveRequest filterInvCountOrderSaveRequest);
 }

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

@@ -22,6 +22,7 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity;
 import com.glxp.api.admin.entity.inventory.*;
 import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
 import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
+import com.glxp.api.admin.req.inventory.FilterInvCountOrderSaveRequest;
 import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest;
 import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
 import com.glxp.api.admin.service.auth.CustomerService;
@@ -200,6 +201,19 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         return ResultVOUtils.success();
     }
 
+    @Override
+    public BaseResponse saveCountOrderForPDA(FilterInvCountOrderSaveRequest filterInvCountOrderSaveRequest) {
+        InvCountOrder invCountOrder = invCountOrderDao.selectByOrderId(filterInvCountOrderSaveRequest.getOrderId());
+        if (null == invCountOrder) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此单据不存在");
+        }
+        if (invCountOrder.getStatus() != 0) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此单据不可编辑");
+        }
+
+        return null;
+    }
+
     /**
      * 盘点单据转扫码单
      *

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

@@ -361,7 +361,11 @@
             <if test="status != null">
                 AND co.status = #{status}
             </if>
+            <if test="orderId != null and orderId != ''">
+                AND co.orderId like concat('%', #{orderId}, '%')
+            </if>
         </where>
+        group by co.orderId
         order by updateTime desc
     </select>